Side by Side Diff: Vagrantfile
Issue 5889762565029888:
Issue 2104 - Set up a test server for adblockplus.org content (Closed)
Patch Set:
Created March 13, 2015, 3:56 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
manifests/monitoringserver.pp » ('j')
|
manifests/webserver.pp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 VAGRANTFILE_API_VERSION = "2" | 1 VAGRANTFILE_API_VERSION = "2" |
| 2 REPOSITORY_DIR = File.dirname(__FILE__) | 2 REPOSITORY_DIR = File.dirname(__FILE__) |
| 3 DEPENDENCY_SCRIPT = File.join(REPOSITORY_DIR, "ensure_dependencies.py") | 3 DEPENDENCY_SCRIPT = File.join(REPOSITORY_DIR, "ensure_dependencies.py") |
| 4 | 4 |
| 5 if !system("python", DEPENDENCY_SCRIPT) | 5 if !system("python", DEPENDENCY_SCRIPT) |
| 6 error = Vagrant::Errors::VagrantError | 6 error = Vagrant::Errors::VagrantError |
| 7 error.error_message("Failed to ensure dependencies being up-to-date!") | 7 error.error_message("Failed to ensure dependencies being up-to-date!") |
| 8 raise error | 8 raise error |
| 9 end | 9 end |
| 10 | 10 |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 74 define_standard_vm config, 'filter9', '10.8.0.135' | 74 define_standard_vm config, 'filter9', '10.8.0.135' |
| 75 define_standard_vm config, 'filter10', '10.8.0.136' | 75 define_standard_vm config, 'filter10', '10.8.0.136' |
| 76 define_standard_vm config, 'filter11', '10.8.0.137' | 76 define_standard_vm config, 'filter11', '10.8.0.137' |
| 77 define_standard_vm config, 'filter12', '10.8.0.138' | 77 define_standard_vm config, 'filter12', '10.8.0.138' |
| 78 define_standard_vm config, 'filter13', '10.8.0.139' | 78 define_standard_vm config, 'filter13', '10.8.0.139' |
| 79 define_standard_vm config, 'filter14', '10.8.0.140' | 79 define_standard_vm config, 'filter14', '10.8.0.140' |
| 80 define_standard_vm config, 'filter15', '10.8.0.141' | 80 define_standard_vm config, 'filter15', '10.8.0.141' |
| 81 define_standard_vm config, 'filter16', '10.8.0.142' | 81 define_standard_vm config, 'filter16', '10.8.0.142' |
| 82 define_standard_vm config, 'filter17', '10.8.0.143' | 82 define_standard_vm config, 'filter17', '10.8.0.143' |
| 83 define_standard_vm config, 'filter18', '10.8.0.144' | 83 define_standard_vm config, 'filter18', '10.8.0.144' |
| 84 define_standard_vm config, 'web2', '10.8.0.145' | |
| 84 end | 85 end |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
manifests/monitoringserver.pp » ('j')
|
manifests/webserver.pp » ('J')
