github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8097 from BenTheElder/vagrant_cpu_count

Browse Source 
Fix vagrant cpu count on linux.
This commit is contained in:
Derek Carr
2015-05-12 10:44:04 -04:00
parent 91fafedffd e6b6813015
commit 0270fb2d4f
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Vagrantfile vendored
View File

@@ -79,7 +79,13 @@ host = RbConfig::CONFIG['host_os']
if host =~ /darwin/ if host =~ /darwin/
$vm_cpus = `sysctl -n hw.physicalcpu`.to_i $vm_cpus = `sysctl -n hw.physicalcpu`.to_i
elsif host =~ /linux/ elsif host =~ /linux/
$vm_cpus = `cat /proc/cpuinfo | grep 'core id' | wc -l`.to_i #This should work on most processors, however it will fail on ones without the core id field.
#So far i have only seen this on a raspberry pi. which you probably don't want to run vagrant on anyhow...
#But just in case we'll default to the result of nproc if we get 0 just to be safe.
$vm_cpus = `cat /proc/cpuinfo | grep 'core id' | uniq | wc -l`.to_i
if $vm_cpus < 1
$vm_cpus = `nproc`.to_i
end
else # sorry Windows folks, I can't help you else # sorry Windows folks, I can't help you
$vm_cpus = 2 $vm_cpus = 2
end end