Merge pull request #8675 from hashicorp/fix_5957

Fix 5957

builder/amazon/common/ssh.go

@@ -24,7 +24,7 @@ var (
 func SSHHost(e ec2Describer, sshInterface string, host string) func(multistep.StateBag) (string, error) {
 	return func(state multistep.StateBag) (string, error) {
 		if host != "" {
-			log.Printf("Using ssh_host value: %s", host)
+			log.Printf("Using host value: %s", host)
 			return host, nil
 		}
 

builder/amazon/ebs/builder.go

@@ -259,7 +259,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Host: awscommon.SSHHost(
 				ec2conn,
 				b.config.SSHInterface,
-				b.config.Comm.SSHHost,
+				b.config.Comm.Host(),
 			),
 			SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(),
 		},

builder/amazon/ebssurrogate/builder.go

@@ -282,7 +282,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Host: awscommon.SSHHost(
 				ec2conn,
 				b.config.SSHInterface,
-				b.config.Comm.SSHHost,
+				b.config.Comm.Host(),
 			),
 			SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(),
 		},

builder/amazon/ebsvolume/builder.go

@@ -252,7 +252,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Host: awscommon.SSHHost(
 				ec2conn,
 				b.config.SSHInterface,
-				b.config.Comm.SSHHost,
+				b.config.Comm.Host(),
 			),
 			SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(),
 		},

builder/amazon/instance/builder.go

@@ -342,7 +342,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Host: awscommon.SSHHost(
 				ec2conn,
 				b.config.SSHInterface,
-				b.config.Comm.SSHHost,
+				b.config.Comm.Host(),
 			),
 			SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(),
 		},

builder/cloudstack/builder.go

@@ -79,7 +79,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		&stepDetachIso{},
 		&communicator.StepConnect{
 			Config:    &b.config.Comm,
-			Host:      communicator.CommHost(b.config.Comm.SSHHost, "ipaddress"),
+			Host:      communicator.CommHost(b.config.Comm.Host(), "ipaddress"),
 			SSHConfig: b.config.Comm.SSHConfigFunc(),
 			SSHPort:   commPort,
 			WinRMPort: commPort,

builder/digitalocean/builder.go

@@ -88,7 +88,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		new(stepDropletInfo),
 		&communicator.StepConnect{
 			Config:    &b.config.Comm,
-			Host:      communicator.CommHost(b.config.Comm.SSHHost, "droplet_ip"),
+			Host:      communicator.CommHost(b.config.Comm.Host(), "droplet_ip"),
 			SSHConfig: b.config.Comm.SSHConfigFunc(),
 		},
 		new(common.StepProvision),

builder/docker/builder.go

@@ -50,7 +50,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		&StepRun{},
 		&communicator.StepConnect{
 			Config:    &b.config.Comm,
-			Host:      commHost(b.config.Comm.SSHHost),
+			Host:      commHost(b.config.Comm.Host()),
 			SSHConfig: b.config.Comm.SSHConfigFunc(),
 			CustomConnect: map[string]multistep.Step{
 				"docker":                 &StepConnectDocker{},

builder/docker/comm.go

@@ -9,7 +9,7 @@ import (
 func commHost(host string) func(multistep.StateBag) (string, error) {
 	return func(state multistep.StateBag) (string, error) {
 		if host != "" {
-			log.Printf("Using ssh_host value: %s", host)
+			log.Printf("Using host value: %s", host)
 			return host, nil
 		}
 		containerId := state.Get("container_id").(string)

builder/googlecompute/builder.go

@@ -68,7 +68,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		},
 		&communicator.StepConnect{
 			Config:      &b.config.Comm,
-			Host:        communicator.CommHost(b.config.Comm.SSHHost, "instance_ip"),
+			Host:        communicator.CommHost(b.config.Comm.Host(), "instance_ip"),
 			SSHConfig:   b.config.Comm.SSHConfigFunc(),
 			WinRMConfig: winrmConfig,
 		},

builder/hyperv/common/ssh.go

@@ -11,7 +11,7 @@ func CommHost(host string) func(multistep.StateBag) (string, error) {
 
 		// Skip IP auto detection if the configuration has an ssh host configured.
 		if host != "" {
-			log.Printf("Using ssh_host value: %s", host)
+			log.Printf("Using host value: %s", host)
 			return host, nil
 		}
 

builder/linode/builder.go

@@ -59,7 +59,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (ret
 		&stepCreateLinode{client},
 		&communicator.StepConnect{
 			Config:    &b.config.Comm,
-			Host:      commHost(b.config.Comm.SSHHost),
+			Host:      commHost(b.config.Comm.Host()),
 			SSHConfig: b.config.Comm.SSHConfigFunc(),
 		},
 		&common.StepProvision{},
@@ -104,7 +104,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (ret
 func commHost(host string) func(multistep.StateBag) (string, error) {
 	return func(state multistep.StateBag) (string, error) {
 		if host != "" {
-			log.Printf("Using ssh_host value: %s", host)
+			log.Printf("Using host value: %s", host)
 			return host, nil
 		}
 

builder/oneandone/builder.go

@@ -46,7 +46,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		new(stepCreateServer),
 		&communicator.StepConnect{
 			Config:    &b.config.Comm,
-			Host:      communicator.CommHost(b.config.Comm.SSHHost, "server_ip"),
+			Host:      communicator.CommHost(b.config.Comm.Host(), "server_ip"),
 			SSHConfig: b.config.Comm.SSHConfigFunc(),
 		},
 		&common.StepProvision{},

builder/openstack/ssh.go

@@ -20,7 +20,7 @@ func CommHost(
 	sshipversion string) func(multistep.StateBag) (string, error) {
 	return func(state multistep.StateBag) (string, error) {
 		if host != "" {
-			log.Printf("Using ssh_host value: %s", host)
+			log.Printf("Using host value: %s", host)
 			return host, nil
 		}
 

builder/oracle/classic/builder.go

@@ -103,7 +103,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			},
 			&communicator.StepConnect{
 				Config:    &b.config.Comm,
-				Host:      communicator.CommHost(b.config.Comm.SSHHost, "instance_ip"),
+				Host:      communicator.CommHost(b.config.Comm.Host(), "instance_ip"),
 				SSHConfig: b.config.Comm.SSHConfigFunc(),
 			},
 			&common.StepProvision{},
@@ -133,7 +133,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 				KeyName: fmt.Sprintf("packer-generated-key_%s", runID),
 				StepConnectSSH: &communicator.StepConnectSSH{
 					Config:    &b.config.BuilderComm,
-					Host:      communicator.CommHost(b.config.Comm.SSHHost, "instance_ip"),
+					Host:      communicator.CommHost(b.config.Comm.Host(), "instance_ip"),
 					SSHConfig: b.config.BuilderComm.SSHConfigFunc(),
 				},
 			},
@@ -166,7 +166,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			&stepCreateInstance{},
 			&communicator.StepConnect{
 				Config:    &b.config.Comm,
-				Host:      communicator.CommHost(b.config.Comm.SSHHost, "instance_ip"),
+				Host:      communicator.CommHost(b.config.Comm.Host(), "instance_ip"),
 				SSHConfig: b.config.Comm.SSHConfigFunc(),
 			},
 			&common.StepProvision{},

builder/oracle/oci/builder.go

@@ -67,7 +67,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		},
 		&communicator.StepConnect{
 			Config:    &b.config.Comm,
-			Host:      communicator.CommHost(b.config.Comm.SSHHost, "instance_ip"),
+			Host:      communicator.CommHost(b.config.Comm.Host(), "instance_ip"),
 			SSHConfig: b.config.Comm.SSHConfigFunc(),
 		},
 		&common.StepProvision{},

builder/parallels/common/ssh.go

@@ -10,7 +10,7 @@ import (
 func CommHost(host string) func(multistep.StateBag) (string, error) {
 	return func(state multistep.StateBag) (string, error) {
 		if host != "" {
-			log.Printf("Using ssh_host value: %s", host)
+			log.Printf("Using host value: %s", host)
 			return host, nil
 		}
 		vmName := state.Get("vmName").(string)

builder/profitbricks/builder.go

@@ -43,7 +43,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		new(stepCreateServer),
 		&communicator.StepConnect{
 			Config:    &b.config.Comm,
-			Host:      communicator.CommHost(b.config.Comm.SSHHost, "server_ip"),
+			Host:      communicator.CommHost(b.config.Comm.Host(), "server_ip"),
 			SSHConfig: b.config.Comm.SSHConfigFunc(),
 		},
 		&common.StepProvision{},

builder/qemu/builder.go

@@ -652,7 +652,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		steps = append(steps,
 			&communicator.StepConnect{
 				Config:    &b.config.Comm,
-				Host:      commHost(b.config.Comm.SSHHost),
+				Host:      commHost(b.config.Comm.Host()),
 				SSHConfig: b.config.Comm.SSHConfigFunc(),
 				SSHPort:   commPort,
 				WinRMPort: commPort,

builder/qemu/ssh.go

@@ -9,7 +9,7 @@ import (
 func commHost(host string) func(multistep.StateBag) (string, error) {
 	return func(state multistep.StateBag) (string, error) {
 		if host != "" {
-			log.Printf("Using ssh_host value: %s", host)
+			log.Printf("Using host value: %s", host)
 			return host, nil
 		}
 

builder/scaleway/builder.go

@@ -59,7 +59,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		new(stepServerInfo),
 		&communicator.StepConnect{
 			Config:    &b.config.Comm,
-			Host:      communicator.CommHost(b.config.Comm.SSHHost, "server_ip"),
+			Host:      communicator.CommHost(b.config.Comm.Host(), "server_ip"),
 			SSHConfig: b.config.Comm.SSHConfigFunc(),
 		},
 		new(common.StepProvision),

builder/triton/builder.go

@@ -67,7 +67,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		&StepCreateSourceMachine{},
 		&communicator.StepConnect{
 			Config:    &config.Comm,
-			Host:      commHost(b.config.Comm.SSHHost),
+			Host:      commHost(b.config.Comm.Host()),
 			SSHConfig: b.config.Comm.SSHConfigFunc(),
 		},
 		&common.StepProvision{},

builder/triton/ssh.go

@@ -9,7 +9,7 @@ import (
 func commHost(host string) func(multistep.StateBag) (string, error) {
 	return func(state multistep.StateBag) (string, error) {
 		if host != "" {
-			log.Printf("Using ssh_host value: %s", host)
+			log.Printf("Using host value: %s", host)
 			return host, nil
 		}
 

builder/vsphere/clone/builder.go

@@ -62,7 +62,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			},
 			&communicator.StepConnect{
 				Config:    &b.config.Comm,
-				Host:      common.CommHost(b.config.Comm.SSHHost),
+				Host:      common.CommHost(b.config.Comm.Host()),
 				SSHConfig: b.config.Comm.SSHConfigFunc(),
 			},
 			&packerCommon.StepProvision{},

builder/vsphere/iso/builder.go

@@ -106,7 +106,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			},
 			&communicator.StepConnect{
 				Config:    &b.config.Comm,
-				Host:      common.CommHost(b.config.Comm.SSHHost),
+				Host:      common.CommHost(b.config.Comm.Host()),
 				SSHConfig: b.config.Comm.SSHConfigFunc(),
 			},
 			&packerCommon.StepProvision{},

helper/communicator/comm_host.go

@@ -11,7 +11,7 @@ import (
 func CommHost(host string, statebagKey string) func(multistep.StateBag) (string, error) {
 	return func(state multistep.StateBag) (string, error) {
 		if host != "" {
-			log.Printf("Using ssh_host value: %s", host)
+			log.Printf("Using host value: %s", host)
 			return host, nil
 		}
 		ipAddress, hasIP := state.Get(statebagKey).(string)