Vagrantfile - Issue 4768985027444736: 1369 - Integrate ensure_dependencies.py

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Side by Side Diff: Vagrantfile

Issue 4768985027444736: 1369 - Integrate ensure_dependencies.py (Closed)

Patch Set: Updates since last patch set: Created Sept. 18, 2014, 12:59 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | Download patch

« no previous file with comments | « .hgsubstate ('k') | dependencies » ('j') | no next file with comments »

OLD	NEW
1 VAGRANTFILE_API_VERSION = "2"	1 VAGRANTFILE_API_VERSION = "2"

	2 system("python ensure_dependencies.py")
	Wladimir Palant 2014/09/18 13:24:46 This assumes that Vagrantfile is located in the cu This assumes that Vagrantfile is located in the current work directory. However, vagrant will also find Vagrantfile in the parent of the current work directory - plus there is a VAGRANT_CWD environment variable that will change that even further. Please make sure to resolve the path to ensure_dependencies.py relative to __FILE__. Also, please make sure to pass in multiple parameters rather than a shell command - no point getting the shell involved here (potential security hazard). Finally, a failure in ensure_dependencies.py should not be ignored - we don't want to produce a broken VM. So it should be something like: raise "ensure_dependencies.py failed" if not system("python", deps) mathias 2014/09/18 14:11:20 Done. Show quoted text On 2014/09/18 13:24:46, Wladimir Palant wrote: > This assumes that Vagrantfile is located in the current work directory. However, > vagrant will also find Vagrantfile in the parent of the current work directory - > plus there is a VAGRANT_CWD environment variable that will change that even > further. Please make sure to resolve the path to ensure_dependencies.py relative > to __FILE__. > > Also, please make sure to pass in multiple parameters rather than a shell > command - no point getting the shell involved here (potential security hazard). > > Finally, a failure in ensure_dependencies.py should not be ignored - we don't > want to produce a broken VM. So it should be something like: > > raise "ensure_dependencies.py failed" if not system("python", deps) Done.
2	3

3 def define_standard_vm(config, host_name, ip)	4 def define_standard_vm(config, host_name, ip)

4 config.vm.define host_name do \|config\|	5 config.vm.define host_name do \|config\|

5 config.vm.box = 'precise64'	6 config.vm.box = 'precise64'

6 config.vm.box_url = 'http://cloud-images.ubuntu.com/vagrant/precise/current/ precise-server-cloudimg-amd64-vagrant-disk1.box'	7 config.vm.box_url = 'http://cloud-images.ubuntu.com/vagrant/precise/current/ precise-server-cloudimg-amd64-vagrant-disk1.box'

7 config.vm.host_name = "#{host_name}.adblockplus.org"	8 config.vm.host_name = "#{host_name}.adblockplus.org"

8 config.vm.network :private_network, ip: ip	9 config.vm.network :private_network, ip: ip

9 config.vm.provider :virtualbox do \|vb\|	10 config.vm.provider :virtualbox do \|vb\|

10 vb.customize ["modifyvm", :id, "--cpus", 1]	11 vb.customize ["modifyvm", :id, "--cpus", 1]

11	12

(...skipping 55 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
67 define_standard_vm config, 'filter10', '10.8.0.136'	68 define_standard_vm config, 'filter10', '10.8.0.136'

68 define_standard_vm config, 'filter11', '10.8.0.137'	69 define_standard_vm config, 'filter11', '10.8.0.137'

69 define_standard_vm config, 'filter12', '10.8.0.138'	70 define_standard_vm config, 'filter12', '10.8.0.138'

70 define_standard_vm config, 'filter13', '10.8.0.139'	71 define_standard_vm config, 'filter13', '10.8.0.139'

71 define_standard_vm config, 'filter14', '10.8.0.140'	72 define_standard_vm config, 'filter14', '10.8.0.140'

72 define_standard_vm config, 'filter15', '10.8.0.141'	73 define_standard_vm config, 'filter15', '10.8.0.141'

73 define_standard_vm config, 'filter16', '10.8.0.142'	74 define_standard_vm config, 'filter16', '10.8.0.142'

74 define_standard_vm config, 'filter17', '10.8.0.143'	75 define_standard_vm config, 'filter17', '10.8.0.143'

75 define_standard_vm config, 'filter18', '10.8.0.144'	76 define_standard_vm config, 'filter18', '10.8.0.144'

76 end	77 end

OLD	NEW