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

provisioner/salt-masterless: error if any commands exit with non-zero 

[GH-266]

/cc @rgarcia
This commit is contained in:
Mitchell Hashimoto 2013-08-09 17:35:57 -07:00
parent 91898ea8ed
commit adfb6caa2b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -25,6 +25,8 @@ BUG FIXES:
using multiple environmental variables. [GH-263]
* provisioner/salt-masterless: states aren't deleted after the run
anymore. [GH-265]
* provisioner/salt-masterless: error if any commands exit with a non-zero
exit status. [GH-266]
## 0.2.3 (August 7, 2013)

6
provisioner/salt-masterless/provisioner.go
View File

@ -99,7 +99,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
ui.Message(fmt.Sprintf("Creating remote directory: %s", p.config.TempConfigDir))
cmd := &packer.RemoteCmd{Command: fmt.Sprintf("mkdir -p %s", p.config.TempConfigDir)}
if err = cmd.StartWithUi(comm, ui); err != nil {
if err = cmd.StartWithUi(comm, ui); err != nil || cmd.ExitStatus != 0 {
return fmt.Errorf("Error creating remote salt state directory: %s", err)
}
@ -110,13 +110,13 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
ui.Message(fmt.Sprintf("Moving %s to /srv/salt", p.config.TempConfigDir))
cmd = &packer.RemoteCmd{Command: fmt.Sprintf("sudo mv %s /srv/salt", p.config.TempConfigDir)}
if err = cmd.StartWithUi(comm, ui); err != nil {
if err = cmd.StartWithUi(comm, ui); err != nil || cmd.ExitStatus != 0 {
return fmt.Errorf("Unable to move %s to /srv/salt: %d", p.config.TempConfigDir, err)
}
ui.Message("Running highstate")
cmd = &packer.RemoteCmd{Command: "sudo salt-call --local state.highstate -l info"}
if err = cmd.StartWithUi(comm, ui); err != nil {
if err = cmd.StartWithUi(comm, ui); err != nil || cmd.ExitStatus != 0 {
return fmt.Errorf("Error executing highstate: %s", err)
}