matthew/packer-plugin-xenserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #26 from cullman/master

Browse Source 
Some tweaks to make it work with the current version of github.com/xense...
This commit is contained in:
Rob Dobson 2015-04-17 20:22:13 +01:00
commit 37433bc022
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/xenserver/common/step_attach_vdi.go
View File

@ -41,7 +41,7 @@ func (self *StepAttachVdi) Run(state multistep.StateBag) multistep.StepAction {
return multistep.ActionHalt return multistep.ActionHalt
} }
err = instance.ConnectVdi(self.vdi, self.VdiType) err = instance.ConnectVdi(self.vdi, self.VdiType, "")
if err != nil { if err != nil {
ui.Error(fmt.Sprintf("Error attaching VDI '%s': '%s'", vdiUuid, err.Error())) ui.Error(fmt.Sprintf("Error attaching VDI '%s': '%s'", vdiUuid, err.Error()))
return multistep.ActionHalt return multistep.ActionHalt

4
builder/xenserver/iso/step_create_instance.go
View File

@ -50,7 +50,7 @@ func (self *stepCreateInstance) Run(state multistep.StateBag) multistep.StepActi
return multistep.ActionHalt 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 { if err != nil {
ui.Error(fmt.Sprintf("Error setting VM memory=%d: %s", config.VMMemory*1024*1024, err.Error())) ui.Error(fmt.Sprintf("Error setting VM memory=%d: %s", config.VMMemory*1024*1024, err.Error()))
return multistep.ActionHalt return multistep.ActionHalt
@ -77,7 +77,7 @@ func (self *stepCreateInstance) Run(state multistep.StateBag) multistep.StepActi
} }
self.vdi = vdi self.vdi = vdi
err = instance.ConnectVdi(vdi, xsclient.Disk) err = instance.ConnectVdi(vdi, xsclient.Disk, "")
if err != nil { if err != nil {
ui.Error(fmt.Sprintf("Unable to connect packer disk VDI: %s", err.Error())) ui.Error(fmt.Sprintf("Unable to connect packer disk VDI: %s", err.Error()))
return multistep.ActionHalt return multistep.ActionHalt