summaryrefslogtreecommitdiff
path: root/lib/chef/server_api.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/chef/server_api.rb')
-rw-r--r--lib/chef/server_api.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/server_api.rb b/lib/chef/server_api.rb
index cad8586ac8..d233d25232 100644
--- a/lib/chef/server_api.rb
+++ b/lib/chef/server_api.rb
@@ -30,7 +30,7 @@ class Chef
def initialize(url = Chef::Config[:chef_server_url], options = {})
options[:client_name] ||= Chef::Config[:node_name]
- options[:signing_key_filename] ||= Chef::Config[:client_key]
+ options[:signing_key_filename] ||= Chef::Config[:client_key] unless options[:raw_key]
options[:signing_key_filename] = nil if chef_zero_uri?(url)
options[:inflate_json_class] = false
super(url, options)