From 4bb5da7232d47662d5b20835a261b27690d1327d Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Tue, 16 Apr 2013 15:07:37 -0700
Subject: [PATCH] Chef client config defaults are correct [GH-1609]

---
 CHANGELOG.md                                    | 1 +
 plugins/provisioners/chef/config/chef_client.rb | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 109bdf9f9..98576e320 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ BUG FIXES:
 
   - Chef solo run list properly set. [GH-1608]
   - Follow 30x redirects when downloading boxes. [GH-1607]
+  - Chef client config defaults are done properly. [GH-1609]
 
 ## 1.2.0 (April 16, 2013)
 
diff --git a/plugins/provisioners/chef/config/chef_client.rb b/plugins/provisioners/chef/config/chef_client.rb
index d94589180..aa9cff1b3 100644
--- a/plugins/provisioners/chef/config/chef_client.rb
+++ b/plugins/provisioners/chef/config/chef_client.rb
@@ -31,10 +31,15 @@ module VagrantPlugins
         def finalize!
           super
 
+          @chef_server_url = nil if @chef_server_url == UNSET_VALUE
           @client_key_path        = "/etc/chef/client.pem" if @client_key_path == UNSET_VALUE
+          @encrypted_data_bag_secret_key_path = nil if @encrypted_data_bag_secret_key_path == UNSET_VALUE
+          @encrypted_data_bag_secret          = nil if @encrypted_data_bag_secret == UNSET_VALUE
+          @environment = nil if @environment == UNSET_VALUE
           @file_backup_path       = "/srv/chef/cache" if @file_backup_path == UNSET_VALUE
           @file_cache_path        = "/srv/chef/file_store" if @file_cache_path == UNSET_VALUE
           @validation_client_name = "chef-validator" if @validation_client_name == UNSET_VALUE
+          @validation_key_path = nil if @validation_key_path == UNSET_VALUE
 
           if @encrypted_data_bag_secret == UNSET_VALUE
             @encrypted_data_bag_secret = "/tmp/encrypted_data_bag_secret"