Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: Vagrantfile

Issue 5735322126123008: Issue 220 - Switch to Vagrant API version 2 (Closed)
Patch Set: Created March 26, 2014, 3:19 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Vagrantfile
===================================================================
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,15 +1,19 @@
+VAGRANTFILE_API_VERSION = "2"
+
def define_standard_vm(config, host_name, ip)
config.vm.define host_name do |config|
config.vm.box = 'precise64'
config.vm.box_url = 'http://files.vagrantup.com/precise64.box'
config.vm.host_name = "#{host_name}.adblockplus.org"
- config.vm.network :hostonly, ip, { nic_type: '82543GC' }
- config.vm.customize ["modifyvm", :id, "--cpus", 1]
+ config.vm.network :private_network, ip: ip
+ config.vm.provider :virtualbox do |vb|
+ vb.customize ["modifyvm", :id, "--cpus", 1]
+ end
config.vm.provision :shell, :inline => '
if ! test -f /usr/bin/puppet; then
sudo apt-get update && sudo apt-get install -y puppet
fi'
manifest_files = ['vagrant.pp', 'nodes.pp']
manifest_files.each do |manifest_file|
@@ -20,23 +24,25 @@ fi'
puppet.module_path = 'modules'
end
end
yield(config) if block_given?
end
end
-Vagrant::Config.run do |config|
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
define_standard_vm config, 'server4', '10.8.0.99'
define_standard_vm config, 'server5', '10.8.0.100'
define_standard_vm config, 'server6', '10.8.0.101'
define_standard_vm config, 'server7', '10.8.0.102'
define_standard_vm config, 'server10', '10.8.0.105' do |config|
- config.vm.customize ["modifyvm", :id, "--memory", 1024]
+ config.vm.provider :virtualbox do |vb|
+ vb.customize ["modifyvm", :id, "--memory", 1024]
+ end
end
define_standard_vm config, 'server11', '10.8.0.106'
define_standard_vm config, 'server12', '10.8.0.107'
define_standard_vm config, 'server15', '10.8.0.110'
define_standard_vm config, 'server19', '10.8.0.114'
define_standard_vm config, 'notification1', '10.8.0.118'
define_standard_vm config, 'notification2', '10.8.0.119'
define_standard_vm config, 'filter1', '10.8.0.120'
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld