Merge branch 'master' into 'ephemeral-ssh-key-pair-issue-7225'.

builder/googlecompute/driver_gce.go

@@ -34,7 +34,7 @@ type driverGCE struct {
 
 var DriverScopes = []string{"https://www.googleapis.com/auth/compute", "https://www.googleapis.com/auth/devstorage.full_control"}
 
-func NewDriverGCE(ui packer.Ui, p string, a *AccountFile) (Driver, error) {
+func NewClientGCE(a *AccountFile) (*http.Client, error) {
 	var err error
 
 	var client *http.Client
@@ -78,6 +78,15 @@ func NewDriverGCE(ui packer.Ui, p string, a *AccountFile) (Driver, error) {
 		return nil, err
 	}
 
+	return client, nil
+}
+
+func NewDriverGCE(ui packer.Ui, p string, a *AccountFile) (Driver, error) {
+	client, err := NewClientGCE(a)
+	if err != nil {
+		return nil, err
+	}
+
 	log.Printf("[INFO] Instantiating GCE client...")
 	service, err := compute.New(client)
 	if err != nil {

builder/googlecompute/startup.go

@@ -15,7 +15,7 @@ const StartupScriptStatusNotDone string = "notdone"
 var StartupScriptLinux string = fmt.Sprintf(`#!/usr/bin/env bash
 echo "Packer startup script starting."
 RETVAL=0
-BASEMETADATAURL=http://metadata/computeMetadata/v1/instance/
+BASEMETADATAURL=http://metadata.google.internal/computeMetadata/v1/instance/
 
 GetMetadata () {
   echo "$(curl -f -H "Metadata-Flavor: Google" ${BASEMETADATAURL}/${1} 2> /dev/null)"

builder/hyperv/common/step_create_vm.go

@@ -61,9 +61,9 @@ func (s *StepCreateVM) Run(_ context.Context, state multistep.StateBag) multiste
 	}
 
 	// convert the MB to bytes
-	ramSize := int64(s.RamSize * 1024 * 1024)
-	diskSize := int64(s.DiskSize * 1024 * 1024)
-	diskBlockSize := int64(s.DiskBlockSize * 1024 * 1024)
+	ramSize := int64(s.RamSize) * 1024 * 1024
+	diskSize := int64(s.DiskSize) * 1024 * 1024
+	diskBlockSize := int64(s.DiskBlockSize) * 1024 * 1024
 
 	err := driver.CreateVirtualMachine(s.VMName, path, harddrivePath, ramSize, diskSize, diskBlockSize,
 		s.SwitchName, s.Generation, s.DifferencingDisk, s.FixedVHD, s.Version)

builder/vmware/common/hw_config.go

@@ -14,6 +14,7 @@ type HWConfig struct {
 	// cpu information
 	CpuCount   int `mapstructure:"cpus"`
 	MemorySize int `mapstructure:"memory"`
+	CoreCount  int `mapstructure:"cores"`
 
 	// network type and adapter
 	Network            string `mapstructure:"network"`
@@ -40,6 +41,11 @@ func (c *HWConfig) Prepare(ctx *interpolate.Context) []error {
 		errs = append(errs, fmt.Errorf("An invalid amount of memory was specified (memory < 0): %d", c.MemorySize))
 	}
 
+	// Hardware and cpu options
+	if c.CoreCount < 0 {
+		errs = append(errs, fmt.Errorf("An invalid number of cores was specified (cores < 0): %d", c.CoreCount))
+	}
+
 	// Peripherals
 	if !c.Sound {
 		c.Sound = false

builder/vmware/common/hw_config_test.go

@@ -8,6 +8,7 @@ import (
 func testHWConfig() *HWConfig {
 	return &HWConfig{
 		CpuCount:   1,
+		CoreCount:  1,
 		MemorySize: 512,
 
 		Sound: true,
@@ -26,6 +27,10 @@ func TestHWConfigPrepare(t *testing.T) {
 		t.Errorf("bad cpu count: %d", c.CpuCount)
 	}
 
+	if c.CoreCount < 0 {
+		t.Errorf("bad core count: %d", c.CoreCount)
+	}
+
 	if c.MemorySize < 0 {
 		t.Errorf("bad memory size: %d", c.MemorySize)
 	}

builder/vmware/iso/step_create_vmx.go

@@ -423,12 +423,19 @@ func (s *stepCreateVMX) Run(_ context.Context, state multistep.StateBag) multist
 		s.tempDir = vmxDir
 	}
 
-	/// Now to handle options that will modify the template
+	/// Now to handle options that will modify the template without using "vmxTemplateData"
 	vmxData := vmwcommon.ParseVMX(vmxContents)
+
+	// If no cpus were specified, then remove the entry to use the default
 	if vmxData["numvcpus"] == "" {
 		delete(vmxData, "numvcpus")
 	}
 
+	// If some number of cores were specified, then update "cpuid.coresPerSocket" with the requested value
+	if config.HWConfig.CoreCount > 0 {
+		vmxData["cpuid.corespersocket"] = strconv.Itoa(config.HWConfig.CoreCount)
+	}
+
 	/// Write the vmxData to the vmxPath
 	vmxPath := filepath.Join(vmxDir, config.VMName+".vmx")
 	if err := vmwcommon.WriteVMX(vmxPath, vmxData); err != nil {