diff options
| author | Thom May <thom@may.lt> | 2016-10-04 17:30:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-04 17:30:12 +0100 |
| commit | b8804983cf5ced0fee5d27ca597bee27b7025357 (patch) | |
| tree | 56a925e55f4872237235bd635f4636b96439ceea /lib | |
| parent | f33deece4b704437cb6ead06d1dc24414126150e (diff) | |
| parent | 88550632a4205375287c34a9dd220ed3859fa02c (diff) | |
| download | chef-b8804983cf5ced0fee5d27ca597bee27b7025357.tar.gz | |
Merge pull request #5314 from chef/tm/raw_key
Allow raw_key to override the configured signing_key
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/chef/server_api.rb | 2 |
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) |