diff options
| author | Jeff Blaine <jblaine@kickflop.net> | 2015-08-31 15:29:35 -0400 |
|---|---|---|
| committer | Bryan McLellan <btm@chef.io> | 2015-11-23 18:05:01 -0500 |
| commit | 925317bfd39a6b395a7117e01dd1dea78e240f40 (patch) | |
| tree | cf3bfaa3da1c500b80556a4c445862a934c8d01d /lib/chef/knife/bootstrap.rb | |
| parent | 3419637a9d287782162b3fd76041a449bc5f07e7 (diff) | |
| download | chef-925317bfd39a6b395a7117e01dd1dea78e240f40.tar.gz | |
DTRT re: identity_file
Diffstat (limited to 'lib/chef/knife/bootstrap.rb')
| -rw-r--r-- | lib/chef/knife/bootstrap.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb index 5d9c2a46ba..30ea3cac6c 100644 --- a/lib/chef/knife/bootstrap.rb +++ b/lib/chef/knife/bootstrap.rb @@ -430,8 +430,7 @@ class Chef ssh.config[:ssh_port] = config[:ssh_port] ssh.config[:ssh_gateway] = config[:ssh_gateway] ssh.config[:forward_agent] = config[:forward_agent] - ssh.config[:identity_file] = config[:identity_file] # DEPRECATED - ssh.config[:ssh_identity_file] = config[:ssh_identity_file] + ssh.config[:ssh_identity_file] = config[:ssh_identity_file] || config[:identity_file] ssh.config[:manual] = true ssh.config[:host_key_verify] = config[:host_key_verify] ssh.config[:on_error] = :raise @@ -440,7 +439,6 @@ class Chef def knife_ssh_with_password_auth ssh = knife_ssh - ssh.config[:identity_file] = nil ssh.config[:ssh_identity_file] = nil ssh.config[:ssh_password] = ssh.get_password ssh |