iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8675 from hashicorp/fix_5957 

Fix 5957
This commit is contained in:
Wilken Rivera 2020-01-31 15:24:46 -05:00 committed by GitHub
parent c6dddb75cf d252a24b82
commit 4f78876754
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/amazon/common/ssh.go
View File

@ -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
}

2
builder/amazon/ebs/builder.go
View File

@ -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(),
},

2
builder/amazon/ebssurrogate/builder.go
View File

@ -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(),
},

2
builder/amazon/ebsvolume/builder.go
View File

@ -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(),
},

2
builder/amazon/instance/builder.go
View File

@ -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(),
},

2
builder/cloudstack/builder.go
View File

@ -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,

2
builder/digitalocean/builder.go
View File

@ -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),

2
builder/docker/builder.go
View File

@ -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{},

2
builder/docker/comm.go
View File

@ -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)

2
builder/googlecompute/builder.go
View File

@ -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,
},

2
builder/hyperv/common/ssh.go
View File

@ -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
}

4
builder/linode/builder.go
View File

@ -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
}

2
builder/oneandone/builder.go
View File

@ -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{},

2
builder/openstack/ssh.go
View File

@ -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
}

6
builder/oracle/classic/builder.go
View File

@ -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{},

2
builder/oracle/oci/builder.go
View File

@ -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{},

2
builder/parallels/common/ssh.go
View File

@ -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)

2
builder/profitbricks/builder.go
View File

@ -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{},

2
builder/qemu/builder.go
View File

@ -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,

2
builder/qemu/ssh.go
View File

@ -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
}

2
builder/scaleway/builder.go
View File

@ -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),

2
builder/triton/builder.go
View File

@ -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{},

2
builder/triton/ssh.go
View File

@ -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
}

2
builder/vsphere/clone/builder.go
View File

@ -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{},

2
builder/vsphere/iso/builder.go
View File

@ -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{},

2
helper/communicator/comm_host.go
View File

@ -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)