From 06d4b6a4e5b951d59025d8042275be6def8541b2 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 11 Jan 2012 22:35:28 -0800
Subject: [PATCH] Don't default config values to nil

---
 lib/vagrant/provisioners/chef.rb        | 11 -----------
 lib/vagrant/provisioners/chef_client.rb |  1 -
 lib/vagrant/provisioners/chef_solo.rb   |  2 --
 lib/vagrant/provisioners/puppet.rb      |  1 -
 lib/vagrant/provisioners/shell.rb       |  3 ---
 5 files changed, 18 deletions(-)

diff --git a/lib/vagrant/provisioners/chef.rb b/lib/vagrant/provisioners/chef.rb
index c4fddcbfd..dd15f3f7d 100644
--- a/lib/vagrant/provisioners/chef.rb
+++ b/lib/vagrant/provisioners/chef.rb
@@ -115,19 +115,8 @@ module Vagrant
         attr_writer :run_list
 
         def initialize
-          @provisioning_path = nil
           @log_level = :info
           @json = {}
-          @http_proxy = nil
-          @http_proxy_user = nil
-          @http_proxy_pass = nil
-          @https_proxy = nil
-          @https_proxy_user = nil
-          @https_proxy_pass = nil
-          @no_proxy = nil
-          @binary_path = nil
-          @binary_env = nil
-          @run_list = nil
         end
 
         # This returns the json that is merged with the defaults and the
diff --git a/lib/vagrant/provisioners/chef_client.rb b/lib/vagrant/provisioners/chef_client.rb
index b513f0d4e..9716d859d 100644
--- a/lib/vagrant/provisioners/chef_client.rb
+++ b/lib/vagrant/provisioners/chef_client.rb
@@ -25,7 +25,6 @@ module Vagrant
           @client_key_path = "/etc/chef/client.pem"
           @file_cache_path = "/srv/chef/file_store"
           @file_backup_path = "/srv/chef/cache"
-          @encrypted_data_bag_secret_key_path = nil
           @encrypted_data_bag_secret = "/tmp/encrypted_data_bag_secret"
         end
 
diff --git a/lib/vagrant/provisioners/chef_solo.rb b/lib/vagrant/provisioners/chef_solo.rb
index 4c38c1e8f..a2ac82d80 100644
--- a/lib/vagrant/provisioners/chef_solo.rb
+++ b/lib/vagrant/provisioners/chef_solo.rb
@@ -20,8 +20,6 @@ module Vagrant
           super
 
           @cookbooks_path = ["cookbooks", [:vm, "cookbooks"]]
-          @roles_path = nil
-          @data_bags_path = nil
           @nfs = false
         end
 
diff --git a/lib/vagrant/provisioners/puppet.rb b/lib/vagrant/provisioners/puppet.rb
index 5ec7fb33a..1a9ef587d 100644
--- a/lib/vagrant/provisioners/puppet.rb
+++ b/lib/vagrant/provisioners/puppet.rb
@@ -17,7 +17,6 @@ module Vagrant
         def initialize
           @manifest_file = "default.pp"
           @manifests_path = "manifests"
-          @module_path = nil
           @pp_path = "/tmp/vagrant-puppet"
           @options = []
         end
diff --git a/lib/vagrant/provisioners/shell.rb b/lib/vagrant/provisioners/shell.rb
index adad6996f..c1c035167 100644
--- a/lib/vagrant/provisioners/shell.rb
+++ b/lib/vagrant/provisioners/shell.rb
@@ -10,10 +10,7 @@ module Vagrant
         attr_accessor :args
 
         def initialize
-          @inline = nil
-          @path = nil
           @upload_path = "/tmp/vagrant-shell"
-          @args = nil
         end
 
         def validate(env, errors)