haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't provide a default for the environment. That way currently the environment that is currently set for a node on the server is not mistakenly overridden with "_default".

This commit is contained in:
Pat Collins 2011-05-10 15:57:47 -04:00 committed by Mitchell Hashimoto
parent 5f751d5a77
commit 1134c0b7d6
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/vagrant/provisioners/chef_server.rb
View File

@ -23,7 +23,6 @@ module Vagrant
@client_key_path = "/etc/chef/client.pem" @client_key_path = "/etc/chef/client.pem"
@file_cache_path = "/srv/chef/file_store" @file_cache_path = "/srv/chef/file_store"
@file_backup_path = "/srv/chef/cache" @file_backup_path = "/srv/chef/cache"
@environment = "_default"
end end
def validate(errors) def validate(errors)

2
templates/chef_server_client.erb
View File

@ -13,7 +13,7 @@ client_key "<%= client_key %>"
file_cache_path "<%= file_cache_path %>" file_cache_path "<%= file_cache_path %>"
file_backup_path "<%= file_backup_path %>" file_backup_path "<%= file_backup_path %>"
<% unless environment == "_default" %> <% unless environment.nil? %>
environment "<%= environment %>" environment "<%= environment %>"
<% end %> <% end %>