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

Merge pull request #4099 from mitchellh/fix-issue-2476-chef-client-node-cleanup 

provisioners/chef: clean bundle env when executing chef client
This commit is contained in:
Mitchell Hashimoto 2014-08-06 10:13:37 -07:00
parent 2321e44cc2 2fd634273f
commit 22395e5cb4
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,6 +104,9 @@ module VagrantPlugins
"vagrant.provisioners.chef.deleting_from_server", "vagrant.provisioners.chef.deleting_from_server",
deletable: deletable, name: node_name)) deletable: deletable, name: node_name))
# Knife is not part of the current Vagrant bundle, so it needs to run
# in the context of the system.
Bundler.with_clean_env do
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
@ -118,3 +121,4 @@ module VagrantPlugins
end end
end end
end end
end