From c9e8a87a3bf076ba0318b39942f4d01c010e5658 Mon Sep 17 00:00:00 2001 From: Nathan LeClaire Date: Mon, 13 Jun 2016 16:06:08 -0700 Subject: [PATCH] Fix driver CPU inconsistency Signed-off-by: Nathan LeClaire --- drivers/vmwarefusion/fusion_darwin.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/vmwarefusion/fusion_darwin.go b/drivers/vmwarefusion/fusion_darwin.go index 4d459819b8..370beeea30 100644 --- a/drivers/vmwarefusion/fusion_darwin.go +++ b/drivers/vmwarefusion/fusion_darwin.go @@ -44,7 +44,6 @@ type Driver struct { CPU int ISO string Boot2DockerURL string - CPUS int SSHPassword string ConfigDriveISO string @@ -56,7 +55,7 @@ const ( defaultSSHUser = B2DUser defaultSSHPass = B2DPass defaultDiskSize = 20000 - defaultCpus = 1 + defaultCPU = 1 defaultMemory = 1024 ) @@ -80,7 +79,7 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag { EnvVar: "FUSION_CPU_COUNT", Name: "vmwarefusion-cpu-count", Usage: "number of CPUs for the machine (-1 to use the number of CPUs available)", - Value: defaultCpus, + Value: defaultCPU, }, mcnflag.IntFlag{ EnvVar: "FUSION_MEMORY_SIZE", @@ -116,7 +115,7 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag { func NewDriver(hostName, storePath string) drivers.Driver { return &Driver{ - CPUS: defaultCpus, + CPU: defaultCPU, Memory: defaultMemory, DiskSize: defaultDiskSize, SSHPassword: defaultSSHPass,