From 9fcc89bcf128bc954e3e5123f92b56d49ee0104d Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 1 Oct 2013 14:13:16 -0700 Subject: [PATCH] provisioners/chef: use real variable in delete from chef sever [GH-2300] --- CHANGELOG.md | 1 + plugins/provisioners/chef/provisioner/chef_client.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94a2631ab..eb6f76737 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ BUG FIXES: - provisioners/ansibe: Extra vars are converted to strings. [GH-2244] - provisioners/chef: Propagate disabling color if Vagrant has no color enabled. [GH-2246] + - provisioners/chef: Delete from chef server exception fixed. [GH-2300] - provisioners/puppet: Work with restrictive umask. [GH-2241] - provisioners/salt: Remove bootstrap definition file on each run in order to avoid permissions issues. [GH-2290] diff --git a/plugins/provisioners/chef/provisioner/chef_client.rb b/plugins/provisioners/chef/provisioner/chef_client.rb index 565d08a95..93a208a28 100644 --- a/plugins/provisioners/chef/provisioner/chef_client.rb +++ b/plugins/provisioners/chef/provisioner/chef_client.rb @@ -105,6 +105,7 @@ module VagrantPlugins end def delete_from_chef_server(deletable) + env = @machine.env node_name = config.node_name || env[:vm].config.vm.host_name env[:ui].info(I18n.t( "vagrant.provisioners.chef.deleting_from_server",