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

Unified 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.
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
@@ -3,16 +3,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 :private_network, ip: ip
config.vm.provider :virtualbox do |vb|
vb.customize ["modifyvm", :id, "--cpus", 1]
+
+ # Work around https://www.virtualbox.org/ticket/11649
+ vb.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']
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']
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld