haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

provisioners/chef: fix exception during node cleanup [GH-2345]

This commit is contained in:
Mitchell Hashimoto 2013-10-14 17:12:49 -10:00
parent 7f6cdfca77
commit 2be01284ea
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -17,6 +17,8 @@ BUG FIXES:
- providers/virtualbox: Retryable VBoxManage commands are properly - providers/virtualbox: Retryable VBoxManage commands are properly
retried. [GH-2365] retried. [GH-2365]
- provisioners/ansible: Verbosity won't be blank by default. [GH-2320] - provisioners/ansible: Verbosity won't be blank by default. [GH-2320]
- provisioners/chef: Fix exception raised during Chef client node
cleanup. [GH-2345]
- provisioners/salt: Correct master seed file name. [GH-2359] - provisioners/salt: Correct master seed file name. [GH-2359]
## 1.3.4 (October 2, 2013) ## 1.3.4 (October 2, 2013)

11
plugins/provisioners/chef/provisioner/chef_client.rb
View File

@ -27,8 +27,8 @@ module VagrantPlugins
end end
def cleanup def cleanup
delete_from_chef_server('client') if config.delete_client delete_from_chef_server('client') if @config.delete_client
delete_from_chef_server('node') if config.delete_node delete_from_chef_server('node') if @config.delete_node
end end
def create_client_key_folder def create_client_key_folder
@ -105,16 +105,15 @@ module VagrantPlugins
end end
def delete_from_chef_server(deletable) def delete_from_chef_server(deletable)
env = @machine.env node_name = @config.node_name || @machine.config.vm.host_name
node_name = config.node_name || env[:vm].config.vm.host_name @machine.env.ui.info(I18n.t(
env[:ui].info(I18n.t(
"vagrant.provisioners.chef.deleting_from_server", "vagrant.provisioners.chef.deleting_from_server",
deletable: deletable, name: node_name)) deletable: deletable, name: node_name))
command = ["knife", deletable, "delete", "--yes", node_name] command = ["knife", deletable, "delete", "--yes", node_name]
r = Vagrant::Util::Subprocess.execute(*command) r = Vagrant::Util::Subprocess.execute(*command)
if r.exit_code != 0 if r.exit_code != 0
env[:ui].error(I18n.t( @machine.env.ui.error(I18n.t(
"vagrant.chef_client_cleanup_failed", "vagrant.chef_client_cleanup_failed",
deletable: deletable, deletable: deletable,
stdout: r.stdout, stdout: r.stdout,