iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace export output dir in state bag with params 

step_export now has the OutputDir as a param instead of getting it from
the state bag, on the advice of @mwhooker in PR comment
This commit is contained in:
Jimmy The Dog 2017-03-10 10:43:45 +00:00
parent e851efb1b6
commit 1e9b0f7b8f
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/vmware/iso/builder.go
View File

@ -215,7 +215,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
state.Put("debug", b.config.PackerDebug) state.Put("debug", b.config.PackerDebug)
state.Put("dir", dir) state.Put("dir", dir)
state.Put("driver", driver) state.Put("driver", driver)
state.Put("exportPath", exportOutputPath)
state.Put("hook", hook) state.Put("hook", hook)
state.Put("ui", ui) state.Put("ui", ui)
@ -309,6 +308,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
&StepExport{ &StepExport{
Format: b.config.Format, Format: b.config.Format,
SkipExport: b.config.SkipExport, SkipExport: b.config.SkipExport,
OutputDir: exportOutputPath,
}, },
} }

15
builder/vmware/iso/step_export.go
View File

@ -16,9 +16,10 @@ import (
type StepExport struct { type StepExport struct {
Format string Format string
SkipExport bool SkipExport bool
OutputDir string
} }
func (s *StepExport) generateArgs(c *Config, outputPath string, hidePassword bool) []string { func (s *StepExport) generateArgs(c *Config, hidePassword bool) []string {
password := url.QueryEscape(c.RemotePassword) password := url.QueryEscape(c.RemotePassword)
if hidePassword { if hidePassword {
password = "****" password = "****"
@ -28,7 +29,7 @@ func (s *StepExport) generateArgs(c *Config, outputPath string, hidePassword boo
"--skipManifestCheck", "--skipManifestCheck",
"-tt=" + s.Format, "-tt=" + s.Format,
"vi://" + c.RemoteUser + ":" + password + "@" + c.RemoteHost + "/" + c.VMName, "vi://" + c.RemoteUser + ":" + password + "@" + c.RemoteHost + "/" + c.VMName,
outputPath, s.OutputDir,
} }
return append(c.OVFToolOptions, args...) return append(c.OVFToolOptions, args...)
} }
@ -60,16 +61,18 @@ func (s *StepExport) Run(state multistep.StateBag) multistep.StepAction {
} }
// Export the VM // Export the VM
outputPath := state.Get("exportPath").(string) if s.OutputDir == "" {
s.OutputDir = c.VMName + "." + s.Format
}
if s.Format == "ova" { if s.Format == "ova" {
os.MkdirAll(outputPath, 0755) os.MkdirAll(s.OutputDir, 0755)
} }
ui.Say("Exporting virtual machine...") ui.Say("Exporting virtual machine...")
ui.Message(fmt.Sprintf("Executing: %s %s", ovftool, strings.Join(s.generateArgs(c, outputPath, true), " "))) ui.Message(fmt.Sprintf("Executing: %s %s", ovftool, strings.Join(s.generateArgs(c, true), " ")))
var out bytes.Buffer var out bytes.Buffer
cmd := exec.Command(ovftool, s.generateArgs(c, outputPath, false)...) cmd := exec.Command(ovftool, s.generateArgs(c, false)...)
cmd.Stdout = &out cmd.Stdout = &out
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
err := fmt.Errorf("Error exporting virtual machine: %s\n%s\n", err, out.String()) err := fmt.Errorf("Error exporting virtual machine: %s\n%s\n", err, out.String())