diff options
| author | John Keiser <jkeiser@opscode.com> | 2013-09-20 20:24:47 -0700 |
|---|---|---|
| committer | John Keiser <jkeiser@opscode.com> | 2013-10-02 11:57:50 -0700 |
| commit | bbea73b15e3a20b344027bf454e31ce1c31fbc6a (patch) | |
| tree | b85922a2d060fae958dcb2779ed44b42643b5535 /lib/chef/client.rb | |
| parent | f3683788e36ae8fa4975b9a24daeced36b486ec9 (diff) | |
| download | chef-bbea73b15e3a20b344027bf454e31ce1c31fbc6a.tar.gz | |
Do not require client_key to be specified for chef-client when chef-zero is enabled
Diffstat (limited to 'lib/chef/client.rb')
| -rw-r--r-- | lib/chef/client.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/chef/client.rb b/lib/chef/client.rb index a505fe1651..c71452d0e3 100644 --- a/lib/chef/client.rb +++ b/lib/chef/client.rb @@ -368,7 +368,10 @@ class Chef # === Returns # rest<Chef::REST>:: returns Chef::REST connection object def register(client_name=node_name, config=Chef::Config) - if File.exists?(config[:client_key]) + if !config[:client_key] + @events.skipping_registration(client_name, config) + Chef::Log.debug("Client key is unspecified - skipping registration") + elsif File.exists?(config[:client_key]) @events.skipping_registration(client_name, config) Chef::Log.debug("Client key #{config[:client_key]} is present - skipping registration") else |