From 78d05e73d7dcf9bc5111c9431ded976abeda9564 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 20 Mar 2013 22:20:19 -0700 Subject: [PATCH] Chef-solo recipe_url works properly again [GH-1467] --- CHANGELOG.md | 1 + plugins/provisioners/chef/config/chef_solo.rb | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07b0d65bf..44d2e9192 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ BUG FIXES: - Attempt to re-establish SSH connection on `Net::SSH::Disconnect` - Allow any value that can convert to a string for `Vagrant.plugin` + - Chef solo `recipe_url` works properly again. [GH-1467] ## 1.1.2 (March 18, 2013) diff --git a/plugins/provisioners/chef/config/chef_solo.rb b/plugins/provisioners/chef/config/chef_solo.rb index 3bc2c6c15..1bc5e21f3 100644 --- a/plugins/provisioners/chef/config/chef_solo.rb +++ b/plugins/provisioners/chef/config/chef_solo.rb @@ -27,8 +27,12 @@ module VagrantPlugins end def finalize! + @recipe_url = nil if @recipe_url == UNSET_VALUE + if @cookbooks_path == UNSET_VALUE - @cookbooks_path = [[:host, "cookbooks"], [:vm, "cookbooks"]] + @cookbooks_path = [] + @cookbooks_path << [:host, "cookbooks"] if !@recipe_url + @cookbooks_path << [:vm, "cookbooks"] @__defaulted_cookbooks_path = true end @@ -45,7 +49,6 @@ module VagrantPlugins @encrypted_data_bag_secret_key_path = nil if \ @encrypted_data_bag_secret_key_path == UNSET_VALUE @nfs = false if @nfs == UNSET_VALUE - @recipe_url = nil if @recipe_url == UNSET_VALUE end def validate(machine)