From 269ec2f3c98321178a496b88c61248636fa62007 Mon Sep 17 00:00:00 2001
From: Rob Dobson <rob.dobson@citrix.com>
Date: Tue, 18 Nov 2014 18:49:02 +0000
Subject: [PATCH] Switch to using a combination of the GetVNCPort step and the
 ForwardPortOverSSH step.

Signed-off-by: Rob Dobson <rob.dobson@citrix.com>
---
 builder/xenserver/builder.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/builder/xenserver/builder.go b/builder/xenserver/builder.go
index 3284c50..9ddb4ea 100644
--- a/builder/xenserver/builder.go
+++ b/builder/xenserver/builder.go
@@ -343,7 +343,14 @@ func (self *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (pa
 //        new(stepUploadIso),
         new(stepCreateInstance),
         new(stepStartVmPaused),
-        new(stepForwardVncPortOverSsh),
+        new(stepGetVNCPort),
+        &stepForwardPortOverSSH{
+            RemotePort: instanceVNCPort,
+            RemoteDest: instanceVNCIP,
+            HostPortMin: self.config.HostPortMin,
+            HostPortMax: self.config.HostPortMax,
+            ResultKey: "local_vnc_port",
+        },
         new(stepBootWait),
         new(stepTypeBootCommand),
         new(stepWait),