From cb0011d665e2d5e81293023d3193627ce33814f3 Mon Sep 17 00:00:00 2001
From: Ladar Levison <ladar@lavabit.com>
Date: Thu, 27 Dec 2018 02:33:58 -0600
Subject: [PATCH] Fix ssh_host bug in hyper-v builders.

---
 builder/hyperv/common/ssh.go   | 34 ++++++++++++++++++++++------------
 builder/hyperv/iso/builder.go  |  2 +-
 builder/hyperv/vmcx/builder.go |  2 +-
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/builder/hyperv/common/ssh.go b/builder/hyperv/common/ssh.go
index ab136f373..07141aab9 100644
--- a/builder/hyperv/common/ssh.go
+++ b/builder/hyperv/common/ssh.go
@@ -1,22 +1,32 @@
 package common
 
 import (
+  "log"
+
 	"github.com/hashicorp/packer/helper/multistep"
 )
 
-func CommHost(state multistep.StateBag) (string, error) {
-	vmName := state.Get("vmName").(string)
-	driver := state.Get("driver").(Driver)
+func CommHost(host string) func(multistep.StateBag) (string, error) {
+  return func(state multistep.StateBag) (string, error) {
 
-	mac, err := driver.Mac(vmName)
-	if err != nil {
-		return "", err
-	}
+    if host != "" {
+      log.Println("Using ssh_host value: %s", ipAddress)
+      return host, nil
+  	}
 
-	ip, err := driver.IpAddress(mac)
-	if err != nil {
-		return "", err
-	}
+  	vmName := state.Get("vmName").(string)
+  	driver := state.Get("driver").(Driver)
 
-	return ip, nil
+  	mac, err := driver.Mac(vmName)
+  	if err != nil {
+  		return "", err
+  	}
+
+  	ip, err := driver.IpAddress(mac)
+  	if err != nil {
+  		return "", err
+  	}
+
+  	return ip, nil
+  }
 }
diff --git a/builder/hyperv/iso/builder.go b/builder/hyperv/iso/builder.go
index b21f2f385..27d32ffa7 100644
--- a/builder/hyperv/iso/builder.go
+++ b/builder/hyperv/iso/builder.go
@@ -459,7 +459,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		// configure the communicator ssh, winrm
 		&communicator.StepConnect{
 			Config:    &b.config.SSHConfig.Comm,
-			Host:      hypervcommon.CommHost,
+			Host:      hypervcommon.CommHost(b.config.SSHConfig.Comm.SSHHost),
 			SSHConfig: b.config.SSHConfig.Comm.SSHConfigFunc(),
 		},
 
diff --git a/builder/hyperv/vmcx/builder.go b/builder/hyperv/vmcx/builder.go
index e207c548f..d9da950a1 100644
--- a/builder/hyperv/vmcx/builder.go
+++ b/builder/hyperv/vmcx/builder.go
@@ -482,7 +482,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		// configure the communicator ssh, winrm
 		&communicator.StepConnect{
 			Config:    &b.config.SSHConfig.Comm,
-			Host:      hypervcommon.CommHost,
+			Host:      hypervcommon.CommHost(b.config.SSHConfig.Comm.SSHHost),
 			SSHConfig: b.config.SSHConfig.Comm.SSHConfigFunc(),
 		},