From 686ec1866e3c8c0c1a19a310ca84209395c71c09 Mon Sep 17 00:00:00 2001 From: DanHam Date: Fri, 23 Dec 2016 15:55:10 +0000 Subject: [PATCH 1/2] vbox builders now need to explicitly set WinRMPort for StepConnect Aligns vbox builders with changes to helper/communicator/step_connect.go introduced by PR #2576 Fixes #4310 --- builder/virtualbox/iso/builder.go | 1 + builder/virtualbox/ovf/builder.go | 1 + 2 files changed, 2 insertions(+) diff --git a/builder/virtualbox/iso/builder.go b/builder/virtualbox/iso/builder.go index f3785ebd8..9c1238e1e 100644 --- a/builder/virtualbox/iso/builder.go +++ b/builder/virtualbox/iso/builder.go @@ -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), SSHConfig: vboxcommon.SSHConfigFunc(b.config.SSHConfig), SSHPort: vboxcommon.SSHPort, + WinRMPort: vboxcommon.SSHPort, }, &vboxcommon.StepUploadVersion{ Path: b.config.VBoxVersionFile, diff --git a/builder/virtualbox/ovf/builder.go b/builder/virtualbox/ovf/builder.go index bb992ab74..9cf63af2b 100644 --- a/builder/virtualbox/ovf/builder.go +++ b/builder/virtualbox/ovf/builder.go @@ -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), SSHConfig: vboxcommon.SSHConfigFunc(b.config.SSHConfig), SSHPort: vboxcommon.SSHPort, + WinRMPort: vboxcommon.SSHPort, }, &vboxcommon.StepUploadVersion{ Path: b.config.VBoxVersionFile, From 13bb4d153a31b745812da0296dab418534871f82 Mon Sep 17 00:00:00 2001 From: DanHam Date: Fri, 23 Dec 2016 23:15:51 +0000 Subject: [PATCH 2/2] qemu builder now needs to explicitly set WinRMPort for StepConnect Same as vbox builders, aligns qemu with changes to helper/communicator/step_connect.go introduced by PR #2576 --- builder/qemu/builder.go | 1 + 1 file changed, 1 insertion(+) diff --git a/builder/qemu/builder.go b/builder/qemu/builder.go index b1439fc46..ef7d4b621 100644 --- a/builder/qemu/builder.go +++ b/builder/qemu/builder.go @@ -398,6 +398,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe Host: commHost, SSHConfig: sshConfig, SSHPort: commPort, + WinRMPort: commPort, }, ) }