Don't support passing in the config into Chef anymore
This commit is contained in:
parent
161885859a
commit
ca405b29f6
|
@ -66,21 +66,8 @@ module VagrantPlugins
|
||||||
def setup_json
|
def setup_json
|
||||||
env[:ui].info I18n.t("vagrant.provisioners.chef.json")
|
env[:ui].info I18n.t("vagrant.provisioners.chef.json")
|
||||||
|
|
||||||
# Set up our configuration that is passed to the attributes by default
|
# Get the JSON that we're going to expose to Chef
|
||||||
data = { :config => env[:global_config].to_hash }
|
json = config.merged_json.to_json
|
||||||
|
|
||||||
# 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
|
|
||||||
|
|
||||||
# Create a temporary file to store the data so we
|
# Create a temporary file to store the data so we
|
||||||
# can upload it
|
# can upload it
|
||||||
|
|
Loading…
Reference in New Issue