| OLD | NEW |
| 1 def define_standard_vm(config, host_name, ip) | 1 def define_standard_vm(config, host_name, ip) |
| 2 config.vm.define host_name do |config| | 2 config.vm.define host_name do |config| |
| 3 config.vm.box = 'precise64' | 3 config.vm.box = 'precise64' |
| 4 config.vm.box_url = 'http://files.vagrantup.com/precise64.box' | 4 config.vm.box_url = 'http://files.vagrantup.com/precise64.box' |
| 5 config.vm.host_name = host_name | 5 config.vm.host_name = "#{host_name}.adblockplus.org" |
| 6 config.vm.network :hostonly, ip | 6 config.vm.network :hostonly, ip |
| 7 config.vm.customize ["modifyvm", :id, "--cpus", 1] | 7 config.vm.customize ["modifyvm", :id, "--cpus", 1] |
| 8 | 8 |
| 9 config.vm.provision :shell, :inline => ' | 9 config.vm.provision :shell, :inline => ' |
| 10 if ! test -f /usr/bin/puppet; then | 10 if ! test -f /usr/bin/puppet; then |
| 11 sudo apt-get update && sudo apt-get install -y puppet | 11 sudo apt-get update && sudo apt-get install -y puppet |
| 12 fi' | 12 fi' |
| 13 | 13 |
| 14 manifest_files = ['vagrant.pp', 'nodes.pp'] | 14 manifest_files = ['vagrant.pp', 'nodes.pp'] |
| 15 manifest_files.each do |manifest_file| | 15 manifest_files.each do |manifest_file| |
| (...skipping 21 matching lines...) Expand all Loading... |
| 37 | 37 |
| 38 define_standard_vm config, 'server1', '10.8.0.105' | 38 define_standard_vm config, 'server1', '10.8.0.105' |
| 39 define_standard_vm config, 'server3', '10.8.0.99' | 39 define_standard_vm config, 'server3', '10.8.0.99' |
| 40 define_standard_vm config, 'server4', '10.8.0.98' | 40 define_standard_vm config, 'server4', '10.8.0.98' |
| 41 define_standard_vm config, 'server5', '10.8.0.100' | 41 define_standard_vm config, 'server5', '10.8.0.100' |
| 42 define_standard_vm config, 'server6', '10.8.0.101' | 42 define_standard_vm config, 'server6', '10.8.0.101' |
| 43 define_standard_vm config, 'server7', '10.8.0.102' | 43 define_standard_vm config, 'server7', '10.8.0.102' |
| 44 define_standard_vm config, 'server8', '10.8.0.103' | 44 define_standard_vm config, 'server8', '10.8.0.103' |
| 45 define_standard_vm config, 'server9', '10.8.0.104' | 45 define_standard_vm config, 'server9', '10.8.0.104' |
| 46 end | 46 end |
| OLD | NEW |