summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2017-12-15 11:38:44 +0000
committerThom May <thom@chef.io>2017-12-15 11:38:44 +0000
commit7111d753eb2596e7295212752b3f08150ff65f90 (patch)
treec86cfedf4a5f9457fe59cd646145bc56af5aedff
parent569841d88cdfa690dfa76af1bbbccff2746fe707 (diff)
downloadchef-7111d753eb2596e7295212752b3f08150ff65f90.tar.gz
ensure we set up the raw key correctly
Signed-off-by: Thom May <thom@chef.io>
-rw-r--r--lib/chef/server_api.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/chef/server_api.rb b/lib/chef/server_api.rb
index 2bdc5d9fe8..c501544954 100644
--- a/lib/chef/server_api.rb
+++ b/lib/chef/server_api.rb
@@ -31,6 +31,7 @@ class Chef
def initialize(url = Chef::Config[:chef_server_url], options = {})
options[:client_name] ||= Chef::Config[:node_name]
+ options[:raw_key] ||= Chef::Config[:client_key_contents]
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