Side by Side Diff: Vagrantfile
Issue 5645071978332160:
Issue 221 - Virtual Box - NAT-related provisioning crashes on OS X (Closed)
Patch Set:
Created March 26, 2014, 3:44 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
|
no next file »
|
no next file with comments »
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 | 2 |
| 3 def define_standard_vm(config, host_name, ip) | 3 def define_standard_vm(config, host_name, ip) |
| 4 config.vm.define host_name do |config| | 4 config.vm.define host_name do |config| |
| 5 config.vm.box = 'precise64' | 5 config.vm.box = 'precise64' |
| 6 config.vm.box_url = 'http://files.vagrantup.com/precise64.box' | 6 config.vm.box_url = 'http://files.vagrantup.com/precise64.box' |
| 7 config.vm.host_name = "#{host_name}.adblockplus.org" | 7 config.vm.host_name = "#{host_name}.adblockplus.org" |
| 8 config.vm.network :private_network, ip: ip | 8 config.vm.network :private_network, ip: ip |
| 9 config.vm.provider :virtualbox do |vb| | 9 config.vm.provider :virtualbox do |vb| |
| 10 vb.customize ["modifyvm", :id, "--cpus", 1] | 10 vb.customize ["modifyvm", :id, "--cpus", 1] |
| 11 | |
| 12 # Work around https://www.virtualbox.org/ticket/11649 | |
| 13 vb.customize ['modifyvm', :id, '--natdnshostresolver1', 'on'] | |
| 11 end | 14 end |
| 12 | 15 |
| 13 config.vm.provision :shell, :inline => ' | 16 config.vm.provision :shell, :inline => ' |
| 14 if ! test -f /usr/bin/puppet; then | 17 if ! test -f /usr/bin/puppet; then |
| 15 sudo apt-get update && sudo apt-get install -y puppet | 18 sudo apt-get update && sudo apt-get install -y puppet |
| 16 fi' | 19 fi' |
| 17 | 20 |
| 18 manifest_files = ['vagrant.pp', 'nodes.pp'] | 21 manifest_files = ['vagrant.pp', 'nodes.pp'] |
| 19 manifest_files.each do |manifest_file| | 22 manifest_files.each do |manifest_file| |
| 20 config.vm.provision :puppet do |puppet| | 23 config.vm.provision :puppet do |puppet| |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 64 define_standard_vm config, 'filter10', '10.8.0.136' | 67 define_standard_vm config, 'filter10', '10.8.0.136' |
| 65 define_standard_vm config, 'filter11', '10.8.0.137' | 68 define_standard_vm config, 'filter11', '10.8.0.137' |
| 66 define_standard_vm config, 'filter12', '10.8.0.138' | 69 define_standard_vm config, 'filter12', '10.8.0.138' |
| 67 define_standard_vm config, 'filter13', '10.8.0.139' | 70 define_standard_vm config, 'filter13', '10.8.0.139' |
| 68 define_standard_vm config, 'filter14', '10.8.0.140' | 71 define_standard_vm config, 'filter14', '10.8.0.140' |
| 69 define_standard_vm config, 'filter15', '10.8.0.141' | 72 define_standard_vm config, 'filter15', '10.8.0.141' |
| 70 define_standard_vm config, 'filter16', '10.8.0.142' | 73 define_standard_vm config, 'filter16', '10.8.0.142' |
| 71 define_standard_vm config, 'filter17', '10.8.0.143' | 74 define_standard_vm config, 'filter17', '10.8.0.143' |
| 72 define_standard_vm config, 'filter18', '10.8.0.144' | 75 define_standard_vm config, 'filter18', '10.8.0.144' |
| 73 end | 76 end |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
