Allow users specify "config.chef.node_name = nil" to get the FQDN

2010-11-14 18:24:21 +00:00 · 2010-11-14 18:24:21 +00:00 · abf5f3ccfc
parent cdd1be4be5
commit abf5f3ccfc
2 changed files with 4 additions and 0 deletions
--- a/templates/chef_server_client.erb
+++ b/templates/chef_server_client.erb
@ -1,6 +1,8 @@
 log_level          <%= log_level.inspect %>
 log_location       STDOUT
+<% if node_name %>
 node_name          "<%= node_name %>"
+<% end %>
 ssl_verify_mode    :verify_none
 chef_server_url    "<%= chef_server_url %>"

--- a/templates/chef_solo_solo.erb
+++ b/templates/chef_solo_solo.erb
@ -1,4 +1,6 @@
+<% if node_name %>
 node_name "<%= node_name %>"
+<% end %>
 file_cache_path "<%= provisioning_path %>"
 cookbook_path <%= cookbooks_path %>
 role_path <%= roles_path %>