From ca405b29f6b108d4577200476913855d121532d0 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 1 May 2012 22:03:54 -0700 Subject: [PATCH] Don't support passing in the config into Chef anymore --- plugins/provisioners/chef/provisioner/base.rb | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/plugins/provisioners/chef/provisioner/base.rb b/plugins/provisioners/chef/provisioner/base.rb index e0bf2b63c..1f558b72b 100644 --- a/plugins/provisioners/chef/provisioner/base.rb +++ b/plugins/provisioners/chef/provisioner/base.rb @@ -66,21 +66,8 @@ module VagrantPlugins def setup_json env[:ui].info I18n.t("vagrant.provisioners.chef.json") - # Set up our configuration that is passed to the attributes by default - data = { :config => env[:global_config].to_hash } - - # Add our default share directory if it exists - default_share = env[:vm].config.vm.shared_folders["v-root"] - data[:directory] = default_share[:guestpath] if default_share - - # And wrap it under the "vagrant" namespace - data = { :vagrant => data } - - # Merge with the "extra data" which isn't put under the - # vagrant namespace by default - data.merge!(config.merged_json) - - json = data.to_json + # Get the JSON that we're going to expose to Chef + json = config.merged_json.to_json # Create a temporary file to store the data so we # can upload it