From 2bcd68d323d019b13370ed6714bfcc8b12a185cd Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 22 Nov 2011 19:05:44 -0800 Subject: [PATCH] Slight tweaks for GH-556 --- CHANGELOG.md | 2 ++ lib/vagrant/provisioners/chef.rb | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c432947d..408248cbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/lib/vagrant/provisioners/chef.rb b/lib/vagrant/provisioners/chef.rb index 6e2856c08..25389b29a 100644 --- a/lib/vagrant/provisioners/chef.rb +++ b/lib/vagrant/provisioners/chef.rb @@ -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