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

provisioner/salt-masterless: fix the build

This commit is contained in:
Mitchell Hashimoto 2013-08-23 15:58:30 -07:00
parent f76a09fc08
commit 80e36f11b9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,6 +108,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
}
if p.config.MinionConfig != "" {
ui.Message(fmt.Sprintf("Uploading minion config: %s", p.config.MinionConfig))
err := uploadMinionConfig(comm, "/etc/salt/minion", p.config.MinionConfig)
if err != nil {
return err
@ -195,7 +196,6 @@ func UploadLocalDirectory(localDir string, remoteDir string, comm packer.Communi
}
func uploadMinionConfig(comm packer.Communicator, dst string, src string) error {
ui.Message(fmt.Sprintf("Uploading minion config: %s", src))
f, err := os.Open(src)
if err != nil {
return fmt.Errorf("Error opening minion config: %s", err)
@ -205,4 +205,6 @@ func uploadMinionConfig(comm packer.Communicator, dst string, src string) error
if err = comm.Upload(dst, f); err != nil {
return fmt.Errorf("Error uploading minion config: %s", err)
}
return nil
}