Allow buildserver CPU count to be configured

This commit is contained in:
Ciaran Gultnieks 2015-02-01 09:00:04 +00:00
parent d3f8a9f276
commit b71433e66b
2 changed files with 9 additions and 1 deletions

View file

@ -163,10 +163,14 @@ Vagrant.configure("2") do |config|
config.vm.provider "virtualbox" do |v|
v.customize ["modifyvm", :id, "--memory", "{2}"]
v.customize ["modifyvm", :id, "--cpus", "{3}"]
end
config.vm.provision :shell, :path => "fixpaths.sh"
""".format(config['basebox'], config['baseboxurl'], config['memory'])
""".format(config['basebox'],
config['baseboxurl'],
config['memory'],
config['cpus'] or 1)
if 'aptproxy' in config and config['aptproxy']:
vagrantfile += """
config.vm.provision :shell, :inline => 'sudo echo "Acquire::http {{ Proxy \\"{0}\\"; }};" > /etc/apt/apt.conf.d/02proxy && sudo apt-get update'