docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix driver CPU inconsistency 

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
This commit is contained in:
Nathan LeClaire 2016-06-13 16:06:08 -07:00
parent 3dd8466ca8
commit c9e8a87a3b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/vmwarefusion/fusion_darwin.go
View File

@ -44,7 +44,6 @@ type Driver struct {
CPU int CPU int
ISO string ISO string
Boot2DockerURL string Boot2DockerURL string
CPUS int
SSHPassword string SSHPassword string
ConfigDriveISO string ConfigDriveISO string
@ -56,7 +55,7 @@ const (
defaultSSHUser = B2DUser defaultSSHUser = B2DUser
defaultSSHPass = B2DPass defaultSSHPass = B2DPass
defaultDiskSize = 20000 defaultDiskSize = 20000
defaultCpus = 1 defaultCPU = 1
defaultMemory = 1024 defaultMemory = 1024
) )
@ -80,7 +79,7 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
EnvVar: "FUSION_CPU_COUNT", EnvVar: "FUSION_CPU_COUNT",
Name: "vmwarefusion-cpu-count", Name: "vmwarefusion-cpu-count",
Usage: "number of CPUs for the machine (-1 to use the number of CPUs available)", Usage: "number of CPUs for the machine (-1 to use the number of CPUs available)",
Value: defaultCpus, Value: defaultCPU,
}, },
mcnflag.IntFlag{ mcnflag.IntFlag{
EnvVar: "FUSION_MEMORY_SIZE", EnvVar: "FUSION_MEMORY_SIZE",
@ -116,7 +115,7 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
func NewDriver(hostName, storePath string) drivers.Driver { func NewDriver(hostName, storePath string) drivers.Driver {
return &Driver{ return &Driver{
CPUS: defaultCpus, CPU: defaultCPU,
Memory: defaultMemory, Memory: defaultMemory,
DiskSize: defaultDiskSize, DiskSize: defaultDiskSize,
SSHPassword: defaultSSHPass, SSHPassword: defaultSSHPass,