Slight tweaks for GH-556

This commit is contained in:
Mitchell Hashimoto 2011-11-22 19:05:44 -08:00
parent dcef64fa0d
commit 2bcd68d323
2 changed files with 6 additions and 3 deletions

View File

@ -8,6 +8,8 @@
- `vagrant` commands will not output color when stdout is
not a TTY.
- Fix issue where `box_url` set with multiple VMs could cause issues. [GH-564]
- Chef provisioners no longer depend on a "v-root" share being
available. [GH-556]
## 0.8.7 (September 13, 2011)

View File

@ -56,10 +56,11 @@ module Vagrant
def setup_json
env.ui.info I18n.t("vagrant.provisioners.chef.json")
# Set up initial configuration
data, default_share = { :config => env.config.to_hash }, env.config.vm.shared_folders["v-root"]
# Set up our configuration that is passed to the attributes by default
data = { :config => env.config.to_hash }
# Add the directory on the guest if the default shared folder exists
# Add our default share directory if it exists
default_share = env.config.vm.shared_folders["v-root"]
data[:directory] = default_share[:guestpath] if default_share
# And wrap it under the "vagrant" namespace