Merge "Use shortcuts to set CPUs/memory in Vagrantfile"

This commit is contained in:
Jenkins 2015-08-05 15:56:16 +00:00 committed by Gerrit Code Review
commit 3c6d701f2a
2 changed files with 4 additions and 4 deletions

4
Vagrantfile vendored
View File

@ -39,8 +39,8 @@ Vagrant.configure(2) do |config|
config.vm.box = CONFIG['box']['name']
config.vm.synced_folder '.', '/vagrant', disabled: true
config.vm.provider 'virtualbox' do |vb|
vb.customize ['modifyvm', :id, '--memory', CONFIG['resources']['memory']]
vb.customize ['modifyvm', :id, '--cpus', CONFIG['resources']['vcpus']]
vb.memory = CONFIG['resources']['memory']
vb.cpus = CONFIG['resources']['vcpus']
vb.customize ['modifyvm', :id, '--largepages', 'on']
vb.customize ['modifyvm', :id, '--pae', 'off']
end

View File

@ -6,12 +6,12 @@ Vagrant
The installation of Vagrant is documented in the `Vagrant
documentation <https://docs.vagrantup.com/v2/installation/index.html>`__.
Ensure to use at least version ``1.7.2`` of Vagrant.
Ensure to use at least version ``1.7.4`` of Vagrant.
::
$ vagrant --version
Vagrant 1.7.2
Vagrant 1.7.4
Vagrant plugins
~~~~~~~~~~~~~~~