From 388d48cfde860b12d62e95ea4d504664270771e8 Mon Sep 17 00:00:00 2001 From: Cayce Ullman Date: Thu, 16 Apr 2015 15:37:46 -0500 Subject: [PATCH] Some tweaks to make it work with the current version of github.com/xenserver/go-xenserver-client. --- builder/xenserver/common/step_attach_vdi.go | 2 +- builder/xenserver/iso/step_create_instance.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builder/xenserver/common/step_attach_vdi.go b/builder/xenserver/common/step_attach_vdi.go index 9cdb6e5..059dc49 100644 --- a/builder/xenserver/common/step_attach_vdi.go +++ b/builder/xenserver/common/step_attach_vdi.go @@ -41,7 +41,7 @@ func (self *StepAttachVdi) Run(state multistep.StateBag) multistep.StepAction { return multistep.ActionHalt } - err = instance.ConnectVdi(self.vdi, self.VdiType) + err = instance.ConnectVdi(self.vdi, self.VdiType, "") if err != nil { ui.Error(fmt.Sprintf("Error attaching VDI '%s': '%s'", vdiUuid, err.Error())) return multistep.ActionHalt diff --git a/builder/xenserver/iso/step_create_instance.go b/builder/xenserver/iso/step_create_instance.go index faa1055..fc082f6 100644 --- a/builder/xenserver/iso/step_create_instance.go +++ b/builder/xenserver/iso/step_create_instance.go @@ -50,7 +50,7 @@ func (self *stepCreateInstance) Run(state multistep.StateBag) multistep.StepActi return multistep.ActionHalt } - err = instance.SetStaticMemoryRange(config.VMMemory*1024*1024, config.VMMemory*1024*1024) + err = instance.SetStaticMemoryRange(uint64(config.VMMemory*1024*1024), uint64(config.VMMemory*1024*1024)) if err != nil { ui.Error(fmt.Sprintf("Error setting VM memory=%d: %s", config.VMMemory*1024*1024, err.Error())) return multistep.ActionHalt @@ -77,7 +77,7 @@ func (self *stepCreateInstance) Run(state multistep.StateBag) multistep.StepActi } self.vdi = vdi - err = instance.ConnectVdi(vdi, xsclient.Disk) + err = instance.ConnectVdi(vdi, xsclient.Disk, "") if err != nil { ui.Error(fmt.Sprintf("Unable to connect packer disk VDI: %s", err.Error())) return multistep.ActionHalt