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

Merge pull request #4321 from DanHam/gh-4310 

qemu builder and vbox builders now need to explicitly set WinRMPort for StepConnect
This commit is contained in:
Rickard von Essen 2016-12-24 13:45:43 +01:00 committed by GitHub
parent f6fe8e8755 13bb4d153a
commit 33f1808faa
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builder/qemu/builder.go
View File

@ -398,6 +398,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
Host: commHost, Host: commHost,
SSHConfig: sshConfig, SSHConfig: sshConfig,
SSHPort: commPort, SSHPort: commPort,
WinRMPort: commPort,
}, },
) )
} }

1
builder/virtualbox/iso/builder.go
View File

@ -242,6 +242,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
Host: vboxcommon.CommHost(b.config.SSHConfig.Comm.SSHHost), Host: vboxcommon.CommHost(b.config.SSHConfig.Comm.SSHHost),
SSHConfig: vboxcommon.SSHConfigFunc(b.config.SSHConfig), SSHConfig: vboxcommon.SSHConfigFunc(b.config.SSHConfig),
SSHPort: vboxcommon.SSHPort, SSHPort: vboxcommon.SSHPort,
WinRMPort: vboxcommon.SSHPort,
}, },
&vboxcommon.StepUploadVersion{ &vboxcommon.StepUploadVersion{
Path: b.config.VBoxVersionFile, Path: b.config.VBoxVersionFile,

1
builder/virtualbox/ovf/builder.go
View File

@ -116,6 +116,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
Host: vboxcommon.CommHost(b.config.SSHConfig.Comm.SSHHost), Host: vboxcommon.CommHost(b.config.SSHConfig.Comm.SSHHost),
SSHConfig: vboxcommon.SSHConfigFunc(b.config.SSHConfig), SSHConfig: vboxcommon.SSHConfigFunc(b.config.SSHConfig),
SSHPort: vboxcommon.SSHPort, SSHPort: vboxcommon.SSHPort,
WinRMPort: vboxcommon.SSHPort,
}, },
&vboxcommon.StepUploadVersion{ &vboxcommon.StepUploadVersion{
Path: b.config.VBoxVersionFile, Path: b.config.VBoxVersionFile,