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

Merge pull request #4534 from mitchellh/chefclean 

provisioner/chef-client: only upload knife config if we're cleaning
This commit is contained in:
Matthew Hooker 2017-02-26 18:46:15 -08:00 committed by GitHub
parent 1f2df5c174 825f69c64d
commit 6894f93085
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
provisioner/chef-client/provisioner.go
View File

@ -280,20 +280,25 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error {
err = p.executeChef(ui, comm, configPath, jsonPath) err = p.executeChef(ui, comm, configPath, jsonPath)
knifeConfigPath, err2 := p.createKnifeConfig( if !(p.config.SkipCleanNode && p.config.SkipCleanClient) {
ui, comm, nodeName, serverUrl, p.config.ClientKey, p.config.SslVerifyMode)
if err2 != nil {
return fmt.Errorf("Error creating knife config on node: %s", err2)
}
if !p.config.SkipCleanNode {
if err2 := p.cleanNode(ui, comm, nodeName, knifeConfigPath); err2 != nil {
return fmt.Errorf("Error cleaning up chef node: %s", err2)
}
}
if !p.config.SkipCleanClient { knifeConfigPath, knifeErr := p.createKnifeConfig(
if err2 := p.cleanClient(ui, comm, nodeName, knifeConfigPath); err2 != nil { ui, comm, nodeName, serverUrl, p.config.ClientKey, p.config.SslVerifyMode)
return fmt.Errorf("Error cleaning up chef client: %s", err2)
if knifeErr != nil {
return fmt.Errorf("Error creating knife config on node: %s", knifeErr)
}
if !p.config.SkipCleanNode {
if err := p.cleanNode(ui, comm, nodeName, knifeConfigPath); err != nil {
return fmt.Errorf("Error cleaning up chef node: %s", err)
}
}
if !p.config.SkipCleanClient {
if err := p.cleanClient(ui, comm, nodeName, knifeConfigPath); err != nil {
return fmt.Errorf("Error cleaning up chef client: %s", err)
}
} }
} }