Merge pull request #2567 from ffernand/additional_cores_for_guest_os

Using host Linux (Ubuntu 12.04); performance was abysmal.
This commit is contained in:
Robin Ward 2014-07-23 11:13:21 -04:00
commit be15e963ea
1 changed files with 15 additions and 0 deletions

15
Vagrantfile vendored
View File

@ -19,6 +19,21 @@ Vagrant.configure("2") do |config|
# This setting gives the VM 1024MB of RAM instead of the default 384. # This setting gives the VM 1024MB of RAM instead of the default 384.
v.customize ["modifyvm", :id, "--memory", [ENV['DISCOURSE_VM_MEM'].to_i, 1024].max] v.customize ["modifyvm", :id, "--memory", [ENV['DISCOURSE_VM_MEM'].to_i, 1024].max]
# Who has a single core cpu these days anyways?
cpu_count = 2
# Determine the available cores in host system.
# This mostly helps on linux, but it couldn't hurt on MacOSX.
if RUBY_PLATFORM =~ /linux/
cpu_count = `nproc`.to_i
elsif RUBY_PLATFORM =~ /darwin/
cpu_count = `sysctl -n hw.ncpu`.to_i
end
# Assign additional cores to the guest OS.
v.customize ["modifyvm", :id, "--cpus", cpu_count]
v.customize ["modifyvm", :id, "--ioapic", "on"]
# This setting makes it so that network access from inside the vagrant guest # This setting makes it so that network access from inside the vagrant guest
# is able to resolve DNS using the hosts VPN connection. # is able to resolve DNS using the hosts VPN connection.
v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"] v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]