Merge pull request #7970 from williamb1024/master

Decrease the delay between Hyper-V VM startup and hyper-v builder's ability to send keystrokes to the target VM.

builder/hyperv/common/step_run.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 )
@@ -12,6 +13,7 @@ import (
 type StepRun struct {
 	GuiCancelFunc context.CancelFunc
 	Headless      bool
+	SwitchName    string
 	vmName        string
 }
 
@@ -20,17 +22,17 @@ func (s *StepRun) Run(ctx context.Context, state multistep.StateBag) multistep.S
 	ui := state.Get("ui").(packer.Ui)
 	vmName := state.Get("vmName").(string)
 
-	ui.Say("Starting the virtual machine...")
-
-	err := driver.Start(vmName)
+	ui.Say("Determine Host IP for HyperV machine...")
+	hostIp, err := driver.GetHostAdapterIpAddressForSwitch(s.SwitchName)
 	if err != nil {
-		err := fmt.Errorf("Error starting vm: %s", err)
+		err := fmt.Errorf("Error getting host adapter ip address: %s", err)
 		state.Put("error", err)
 		ui.Error(err.Error())
 		return multistep.ActionHalt
 	}
 
-	s.vmName = vmName
+	ui.Say(fmt.Sprintf("Host IP for the HyperV machine: %s", hostIp))
+	common.SetHTTPIP(hostIp)
 
 	if !s.Headless {
 		ui.Say("Attempting to connect with vmconnect...")
@@ -39,6 +41,19 @@ func (s *StepRun) Run(ctx context.Context, state multistep.StateBag) multistep.S
 			log.Printf(fmt.Sprintf("Non-fatal error starting vmconnect: %s. continuing...", err))
 		}
 	}
+
+	ui.Say("Starting the virtual machine...")
+
+	err = driver.Start(vmName)
+	if err != nil {
+		err := fmt.Errorf("Error starting vm: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	s.vmName = vmName
+
 	return multistep.ActionContinue
 }
 

builder/hyperv/common/step_type_boot_command.go

@@ -33,6 +33,7 @@ func (s *StepTypeBootCommand) Run(ctx context.Context, state multistep.StateBag)
 	ui := state.Get("ui").(packer.Ui)
 	driver := state.Get("driver").(Driver)
 	vmName := state.Get("vmName").(string)
+	hostIp := common.GetHTTPIP()
 
 	// Wait the for the vm to boot.
 	if int64(s.BootWait) > 0 {
@@ -45,18 +46,6 @@ func (s *StepTypeBootCommand) Run(ctx context.Context, state multistep.StateBag)
 		}
 	}
 
-	hostIp, err := driver.GetHostAdapterIpAddressForSwitch(s.SwitchName)
-
-	if err != nil {
-		err := fmt.Errorf("Error getting host adapter ip address: %s", err)
-		state.Put("error", err)
-		ui.Error(err.Error())
-		return multistep.ActionHalt
-	}
-
-	ui.Say(fmt.Sprintf("Host IP for the HyperV machine: %s", hostIp))
-
-	common.SetHTTPIP(hostIp)
 	s.Ctx.Data = &bootCommandTemplateData{
 		hostIp,
 		httpPort,

builder/hyperv/iso/builder.go

@@ -449,7 +449,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		},
 
 		&hypervcommon.StepRun{
-			Headless: b.config.Headless,
+			Headless:   b.config.Headless,
+			SwitchName: b.config.SwitchName,
 		},
 
 		&hypervcommon.StepTypeBootCommand{

builder/hyperv/vmcx/builder.go

@@ -486,7 +486,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		},
 
 		&hypervcommon.StepRun{
-			Headless: b.config.Headless,
+			Headless:   b.config.Headless,
+			SwitchName: b.config.SwitchName,
 		},
 
 		&hypervcommon.StepTypeBootCommand{