Don't provide a default for the environment. That way currently the e…

…nvironment that is currently set for a node on the server is not mistakenly overridden with "_default".
wfarr · May 12, 2011 · 1134c0b · 1134c0b
1 parent 5f751d5
commit 1134c0b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/lib/vagrant/provisioners/chef_server.rb b/lib/vagrant/provisioners/chef_server.rb
@@ -23,7 +23,6 @@ def initialize
           @client_key_path = "/etc/chef/client.pem"
           @file_cache_path = "/srv/chef/file_store"
           @file_backup_path = "/srv/chef/cache"
-          @environment = "_default"
         end
 
         def validate(errors)

diff --git a/templates/chef_server_client.erb b/templates/chef_server_client.erb
@@ -13,7 +13,7 @@ client_key             "<%= client_key %>"
 file_cache_path    "<%= file_cache_path %>"
 file_backup_path   "<%= file_backup_path %>"
 
-<% unless environment == "_default" %>
+<% unless environment.nil? %>
 environment        "<%= environment %>"
 <% end %>