diff options
| author | Noah Kantrowitz <noah@coderanger.net> | 2018-05-30 15:59:57 -0700 |
|---|---|---|
| committer | Noah Kantrowitz <noah@coderanger.net> | 2018-05-30 15:59:57 -0700 |
| commit | 3f7ffb322fb8f414ebf28eaa4b6fe4c94d7857a9 (patch) | |
| tree | 848b088488ae5f92f0d785e8c4ba0165d302c2b5 /lib/chef/server_api.rb | |
| parent | a074d491722bf665da843e76672ffbadf92e3661 (diff) | |
| download | chef-3f7ffb322fb8f414ebf28eaa4b6fe4c94d7857a9.tar.gz | |
Add support for signing requests using ssh-agent.
Signed-off-by: Noah Kantrowitz <noah@coderanger.net>
Diffstat (limited to 'lib/chef/server_api.rb')
| -rw-r--r-- | lib/chef/server_api.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/chef/server_api.rb b/lib/chef/server_api.rb index c501544954..62fe319b86 100644 --- a/lib/chef/server_api.rb +++ b/lib/chef/server_api.rb @@ -30,9 +30,11 @@ class Chef class ServerAPI < Chef::HTTP def initialize(url = Chef::Config[:chef_server_url], options = {}) + # # If making a change here, also update Chef::Knife::Raw::RawInputServerAPI. 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[:ssh_agent_signing] ||= Chef::Config[:ssh_agent_signing] options[:signing_key_filename] = nil if chef_zero_uri?(url) options[:inflate_json_class] = false super(url, options) |