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

Merge pull request #1 from xenserver/master

Browse Source 
merge from xenserver/master
This commit is contained in:
kunm 2016-09-01 16:47:54 +08:00 committed by GitHub
commit 2183cb5869
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,4 +1,4 @@
[![Build Status](https://travis-ci.org/rdobson/packer-builder-xenserver.svg?branch=master)](https://travis-ci.org/rdobson/packer-builder-xenserver) [![Build Status](https://travis-ci.org/xenserver/packer-builder-xenserver.svg?branch=master)](https://travis-ci.org/xenserver/packer-builder-xenserver)
# XenServer packer.io builder # XenServer packer.io builder

21
builder/xenserver/iso/builder.go
View File

@ -304,26 +304,17 @@ func (self *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (pa
SSHConfig: xscommon.SSHConfigFunc(self.config.CommonConfig.SSHConfig), SSHConfig: xscommon.SSHConfigFunc(self.config.CommonConfig.SSHConfig),
SSHPort: xscommon.SSHPort, SSHPort: xscommon.SSHPort,
}, },
new(xscommon.StepShutdown),
&xscommon.StepDetachVdi{
VdiUuidKey: "floppy_vdi_uuid",
},
&xscommon.StepDetachVdi{
VdiUuidKey: "iso_vdi_uuid",
},
new(xscommon.StepStartVmPaused),
new(xscommon.StepBootWait),
&communicator.StepConnectSSH{
Config: &self.config.SSHConfig.Comm,
Host: xscommon.CommHost,
SSHConfig: xscommon.SSHConfigFunc(self.config.CommonConfig.SSHConfig),
SSHPort: xscommon.SSHPort,
},
new(common.StepProvision), new(common.StepProvision),
new(xscommon.StepShutdown), new(xscommon.StepShutdown),
&xscommon.StepDetachVdi{
VdiUuidKey: "iso_vdi_uuid",
},
&xscommon.StepDetachVdi{ &xscommon.StepDetachVdi{
VdiUuidKey: "tools_vdi_uuid", VdiUuidKey: "tools_vdi_uuid",
}, },
&xscommon.StepDetachVdi{
VdiUuidKey: "floppy_vdi_uuid",
},
new(xscommon.StepExport), new(xscommon.StepExport),
} }