| Left: | ||
| Right: |
| 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}.adblockplus.org" | 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| |
| 16 config.vm.provision :puppet do |puppet| | 16 config.vm.provision :puppet do |puppet| |
| 17 puppet.options = ['--environment=development'] | 17 puppet.options = ['--environment=development'] |
| 18 puppet.manifests_path = 'manifests' | 18 puppet.manifests_path = 'manifests' |
| 19 puppet.manifest_file = manifest_file | 19 puppet.manifest_file = manifest_file |
| 20 puppet.module_path = 'modules' | 20 puppet.module_path = 'modules' |
| 21 end | 21 end |
| 22 end | 22 end |
| 23 | |
| 24 yield(config) if block_given? | |
|
Wladimir Palant
2013/02/21 12:19:28
Don't we need that for server10 again (different m
Felix Dahlke
2013/02/21 12:20:47
That's true, I'll leave it in. Not a fan of unused
| |
| 25 end | 23 end |
| 26 | 24 |
| 27 end | 25 end |
| 28 | 26 |
| 29 Vagrant::Config.run do |config| | 27 Vagrant::Config.run do |config| |
| 30 define_standard_vm config, 'server0', '10.8.0.97' do |config| | |
| 31 local_anwiki_repository = '../anwiki' | |
| 32 if File.directory?(local_anwiki_repository) | |
| 33 config.vm.share_folder('local_anwiki_repository', | |
| 34 '/mnt/local_anwiki_repository', local_anwiki_repository) | |
| 35 end | |
| 36 end | |
| 37 | |
| 38 define_standard_vm config, 'server1', '10.8.0.105' | 28 define_standard_vm config, 'server1', '10.8.0.105' |
| 39 define_standard_vm config, 'server3', '10.8.0.99' | 29 define_standard_vm config, 'server3', '10.8.0.99' |
| 40 define_standard_vm config, 'server4', '10.8.0.98' | 30 define_standard_vm config, 'server4', '10.8.0.98' |
| 41 define_standard_vm config, 'server5', '10.8.0.100' | 31 define_standard_vm config, 'server5', '10.8.0.100' |
| 42 define_standard_vm config, 'server6', '10.8.0.101' | 32 define_standard_vm config, 'server6', '10.8.0.101' |
| 43 define_standard_vm config, 'server7', '10.8.0.102' | 33 define_standard_vm config, 'server7', '10.8.0.102' |
| 44 define_standard_vm config, 'server8', '10.8.0.103' | 34 define_standard_vm config, 'server8', '10.8.0.103' |
| 45 define_standard_vm config, 'server9', '10.8.0.104' | 35 define_standard_vm config, 'server9', '10.8.0.104' |
| 46 end | 36 end |
| OLD | NEW |