diff --git a/builder/amazon/common/ssh.go b/builder/amazon/common/ssh.go index f085a1dca..b1e2dd2d7 100644 --- a/builder/amazon/common/ssh.go +++ b/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 } diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index 99414952e..a76454616 100644 --- a/builder/amazon/ebs/builder.go +++ b/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(), }, diff --git a/builder/amazon/ebssurrogate/builder.go b/builder/amazon/ebssurrogate/builder.go index f8a51cfee..6007d3fa8 100644 --- a/builder/amazon/ebssurrogate/builder.go +++ b/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(), }, diff --git a/builder/amazon/ebsvolume/builder.go b/builder/amazon/ebsvolume/builder.go index eb474a3e8..d7bf8c590 100644 --- a/builder/amazon/ebsvolume/builder.go +++ b/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(), }, diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go index 98fe6ff03..9fc9d3d30 100644 --- a/builder/amazon/instance/builder.go +++ b/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(), }, diff --git a/builder/cloudstack/builder.go b/builder/cloudstack/builder.go index 4a147b6b3..0572b4f1f 100644 --- a/builder/cloudstack/builder.go +++ b/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, diff --git a/builder/digitalocean/builder.go b/builder/digitalocean/builder.go index 3d4b07920..b4492d7d5 100644 --- a/builder/digitalocean/builder.go +++ b/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), diff --git a/builder/docker/builder.go b/builder/docker/builder.go index 07862491f..3b6ae22f5 100644 --- a/builder/docker/builder.go +++ b/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{}, diff --git a/builder/docker/comm.go b/builder/docker/comm.go index aa21405c5..6feabc3b2 100644 --- a/builder/docker/comm.go +++ b/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) diff --git a/builder/googlecompute/builder.go b/builder/googlecompute/builder.go index b88e0cc0f..47167a43f 100644 --- a/builder/googlecompute/builder.go +++ b/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, }, diff --git a/builder/hyperv/common/ssh.go b/builder/hyperv/common/ssh.go index 133f20a91..c152e419c 100644 --- a/builder/hyperv/common/ssh.go +++ b/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 } diff --git a/builder/linode/builder.go b/builder/linode/builder.go index 81da942f7..0eff01aec 100644 --- a/builder/linode/builder.go +++ b/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 } diff --git a/builder/oneandone/builder.go b/builder/oneandone/builder.go index 94c9ac31c..8fe3526fd 100644 --- a/builder/oneandone/builder.go +++ b/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{}, diff --git a/builder/openstack/ssh.go b/builder/openstack/ssh.go index 1f93363c4..dab50dc24 100644 --- a/builder/openstack/ssh.go +++ b/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 } diff --git a/builder/oracle/classic/builder.go b/builder/oracle/classic/builder.go index 1594dd0e1..6a49f808a 100644 --- a/builder/oracle/classic/builder.go +++ b/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{}, diff --git a/builder/oracle/oci/builder.go b/builder/oracle/oci/builder.go index cf1e5249a..96eaee591 100644 --- a/builder/oracle/oci/builder.go +++ b/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{}, diff --git a/builder/parallels/common/ssh.go b/builder/parallels/common/ssh.go index df82c8082..50f4e4e9c 100644 --- a/builder/parallels/common/ssh.go +++ b/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) diff --git a/builder/profitbricks/builder.go b/builder/profitbricks/builder.go index 86d9d6ca5..f55d6ae0b 100644 --- a/builder/profitbricks/builder.go +++ b/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{}, diff --git a/builder/qemu/builder.go b/builder/qemu/builder.go index 32f2402c3..473f356b0 100644 --- a/builder/qemu/builder.go +++ b/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, diff --git a/builder/qemu/ssh.go b/builder/qemu/ssh.go index a444dc0c4..828c3946d 100644 --- a/builder/qemu/ssh.go +++ b/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 } diff --git a/builder/scaleway/builder.go b/builder/scaleway/builder.go index 0529557e6..1f25a0509 100644 --- a/builder/scaleway/builder.go +++ b/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), diff --git a/builder/triton/builder.go b/builder/triton/builder.go index 50d9ddd6d..6ee06785c 100644 --- a/builder/triton/builder.go +++ b/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{}, diff --git a/builder/triton/ssh.go b/builder/triton/ssh.go index 70d52d5e8..bc34fd6a9 100644 --- a/builder/triton/ssh.go +++ b/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 } diff --git a/builder/vsphere/clone/builder.go b/builder/vsphere/clone/builder.go index 56462e345..bb3f9c574 100644 --- a/builder/vsphere/clone/builder.go +++ b/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{}, diff --git a/builder/vsphere/iso/builder.go b/builder/vsphere/iso/builder.go index 89131ed10..1f6a2bd20 100644 --- a/builder/vsphere/iso/builder.go +++ b/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{}, diff --git a/helper/communicator/comm_host.go b/helper/communicator/comm_host.go index adc49b257..8bebcc888 100644 --- a/helper/communicator/comm_host.go +++ b/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)