Merge pull request #579 from hashicorp/fix/acpi-motherboard-layout-for-efi

refactor: set firmware configuration during create

Author: kp2099

builder/vsphere/driver/vm.go

@@ -143,6 +143,7 @@ type CreateConfig struct {
 	NICs          []NIC
 	USBController []string
 	Version       uint
+	Firmware      string
 	StorageConfig StorageConfig
 }
 
@@ -218,6 +219,19 @@ func (d *VCenterDriver) CreateVM(config *CreateConfig) (VirtualMachine, error) {
 		createSpec.Version = fmt.Sprintf("%s%d", "vmx-", config.Version)
 	}
 
+	// Set firmware, if specified.
+	if config.Firmware != "" {
+		firmware := config.Firmware
+		efiSecureBootEnabled := firmware == "efi-secure"
+		if efiSecureBootEnabled {
+			firmware = "efi"
+		}
+		createSpec.Firmware = firmware
+		createSpec.BootOptions = &types.VirtualMachineBootOptions{
+			EfiSecureBootEnabled: types.NewBool(efiSecureBootEnabled),
+		}
+	}
+
 	folder, err := d.FindFolder(config.Folder)
 	if err != nil {
 		return nil, err
@@ -296,7 +310,9 @@ func (d *VCenterDriver) CreateVM(config *CreateConfig) (VirtualMachine, error) {
 		return nil, fmt.Errorf("something went wrong when creating the VM")
 	}
 
-	return d.NewVM(&vmRef), nil
+	vm := d.NewVM(&vmRef)
+
+	return vm, nil
 }
 
 // Info retrieves properties of the virtual machine object with optional filters
@@ -691,12 +707,10 @@ func (vm *VirtualMachineDriver) Configure(config *HardwareConfig) error {
 		confSpec.DeviceChange = append(confSpec.DeviceChange, spec)
 	}
 
-	efiSecureBootEnabled := false
 	firmware := config.Firmware
-
-	if firmware == "efi-secure" {
+	efiSecureBootEnabled := firmware == "efi-secure"
+	if efiSecureBootEnabled {
 		firmware = "efi"
-		efiSecureBootEnabled = true
 	}
 
 	confSpec.Firmware = firmware
@@ -750,7 +764,7 @@ func (vm *VirtualMachineDriver) Configure(config *HardwareConfig) error {
 		}
 	}
 
-	return err
+	return nil
 }
 
 // Reconfigure modifies the configuration of an existing virtual machine based

builder/vsphere/iso/builder.go

@@ -84,6 +84,7 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
 			Config:   &b.config.CreateConfig,
 			Location: &b.config.LocationConfig,
 			Force:    b.config.PackerForce,
+			Firmware: b.config.Firmware,
 		},
 		&common.StepConfigureHardware{
 			Config: &b.config.HardwareConfig,

builder/vsphere/iso/step_create.go

@@ -170,6 +170,7 @@ type StepCreateVM struct {
 	Config        *CreateConfig
 	Location      *common.LocationConfig
 	Force         bool
+	Firmware      string
 	GeneratedData *packerbuilderdata.GeneratedData
 }
 
@@ -228,6 +229,7 @@ func (s *StepCreateVM) Run(_ context.Context, state multistep.StateBag) multiste
 		NICs:          networkCards,
 		USBController: s.Config.USBController,
 		Version:       s.Config.Version,
+		Firmware:      s.Firmware,
 	})
 	if err != nil {
 		state.Put("error", fmt.Errorf("error creating virtual machine: %v", err))