diff options
| author | danielsdeleo <dan@getchef.com> | 2015-03-27 15:37:41 -0700 |
|---|---|---|
| committer | danielsdeleo <dan@getchef.com> | 2015-04-01 13:35:01 -0700 |
| commit | bb882960a984fc7b80dec12c33cef09cdba9f65f (patch) | |
| tree | 0806bbccd7a89e5c0203b93223ebfdca5d04da1a /lib/chef/server_api.rb | |
| parent | 110f3b77d46d4c58c00e1badeaec92875fb4e1ef (diff) | |
| download | chef-bb882960a984fc7b80dec12c33cef09cdba9f65f.tar.gz | |
Hoist socketless chef-zero support into Chef::HTTP
Was hoping to avoid this, but there are multiple subclasses of
Chef::HTTP that interact with the server, which all must support
socketless mode.
Diffstat (limited to 'lib/chef/server_api.rb')
| -rw-r--r-- | lib/chef/server_api.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/chef/server_api.rb b/lib/chef/server_api.rb index 8cdcd7a09d..ec4a864cb3 100644 --- a/lib/chef/server_api.rb +++ b/lib/chef/server_api.rb @@ -30,6 +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] = nil if chef_zero_uri?(url) super(url, options) end |