From e10b9fb7081be5dd1506847c1ad41cd14af006df Mon Sep 17 00:00:00 2001
From: Megan Marsh <megan@hashicorp.com>
Date: Thu, 18 Jul 2019 09:47:15 -0700
Subject: [PATCH] fix ssh interface conflict

---
 builder/osc/bsu/builder.go          |  2 +-
 builder/osc/bsusurrogate/builder.go |  2 +-
 builder/osc/bsuvolume/builder.go    |  2 +-
 builder/osc/common/run_config.go    | 15 ++++++++-------
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/builder/osc/bsu/builder.go b/builder/osc/bsu/builder.go
index 287676d5b..798371723 100644
--- a/builder/osc/bsu/builder.go
+++ b/builder/osc/bsu/builder.go
@@ -164,7 +164,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Config: &b.config.RunConfig.Comm,
 			Host: osccommon.SSHHost(
 				oapiconn,
-				b.config.Comm.SSHInterface),
+				b.config.SSHInterface),
 			SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(),
 		},
 		&common.StepProvision{},
diff --git a/builder/osc/bsusurrogate/builder.go b/builder/osc/bsusurrogate/builder.go
index 3cefe9a16..1186a5bdc 100644
--- a/builder/osc/bsusurrogate/builder.go
+++ b/builder/osc/bsusurrogate/builder.go
@@ -187,7 +187,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Config: &b.config.RunConfig.Comm,
 			Host: osccommon.SSHHost(
 				oapiconn,
-				b.config.Comm.SSHInterface),
+				b.config.SSHInterface),
 			SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(),
 		},
 		&common.StepProvision{},
diff --git a/builder/osc/bsuvolume/builder.go b/builder/osc/bsuvolume/builder.go
index 914fea983..96d5531d3 100644
--- a/builder/osc/bsuvolume/builder.go
+++ b/builder/osc/bsuvolume/builder.go
@@ -165,7 +165,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Config: &b.config.RunConfig.Comm,
 			Host: osccommon.SSHHost(
 				oapiconn,
-				b.config.Comm.SSHInterface),
+				b.config.SSHInterface),
 			SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(),
 		},
 		&common.StepProvision{},
diff --git a/builder/osc/common/run_config.go b/builder/osc/common/run_config.go
index acd13ae64..1bff1772a 100644
--- a/builder/osc/common/run_config.go
+++ b/builder/osc/common/run_config.go
@@ -87,7 +87,8 @@ type RunConfig struct {
 	WindowsPasswordTimeout      time.Duration              `mapstructure:"windows_password_timeout"`
 
 	// Communicator settings
-	Comm communicator.Config `mapstructure:",squash"`
+	Comm         communicator.Config `mapstructure:",squash"`
+	SSHInterface string              `mapstructure:"ssh_interface"`
 }
 
 func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
@@ -113,12 +114,12 @@ func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
 	errs := c.Comm.Prepare(ctx)
 
 	// Validating ssh_interface
-	if c.Comm.SSHInterface != "public_ip" &&
-		c.Comm.SSHInterface != "private_ip" &&
-		c.Comm.SSHInterface != "public_dns" &&
-		c.Comm.SSHInterface != "private_dns" &&
-		c.Comm.SSHInterface != "" {
-		errs = append(errs, fmt.Errorf("Unknown interface type: %s", c.Comm.SSHInterface))
+	if c.SSHInterface != "public_ip" &&
+		c.SSHInterface != "private_ip" &&
+		c.SSHInterface != "public_dns" &&
+		c.SSHInterface != "private_dns" &&
+		c.SSHInterface != "" {
+		errs = append(errs, fmt.Errorf("Unknown interface type: %s", c.SSHInterface))
 	}
 
 	if c.Comm.SSHKeyPairName != "" {