diff options
author | Tim Smith <tsmith@chef.io> | 2018-01-22 07:47:38 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-22 07:47:38 -0800 |
commit | 80b52b6048b6e1e047a940f7e21a29e76497ea9b (patch) | |
tree | c263d04b57619aafe3f8cafadc695c47c650bb40 /lib/chef/knife | |
parent | b356460e1affea08d0fac0dde18b57bdbb01b508 (diff) | |
parent | 87c13a35620d8cb68768b4896a9b935215f12d46 (diff) | |
download | chef-80b52b6048b6e1e047a940f7e21a29e76497ea9b.tar.gz |
Merge pull request #6445 from chef/knife_ssh_identity_file
Remove deprecated knife ssh --identity-file option
Diffstat (limited to 'lib/chef/knife')
-rw-r--r-- | lib/chef/knife/ssh.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/chef/knife/ssh.rb b/lib/chef/knife/ssh.rb index 5e5cc738f2..6d79cd10fd 100644 --- a/lib/chef/knife/ssh.rb +++ b/lib/chef/knife/ssh.rb @@ -105,10 +105,6 @@ class Chef :description => "Enable SSH agent forwarding", :boolean => true - option :identity_file, - :long => "--identity-file IDENTITY_FILE", - :description => "The SSH identity file used for authentication. [DEPRECATED] Use --ssh-identity-file instead." - option :ssh_identity_file, :short => "-i IDENTITY_FILE", :long => "--ssh-identity-file IDENTITY_FILE", @@ -569,8 +565,7 @@ class Chef end def configure_ssh_identity_file - # config[:identity_file] is DEPRECATED in favor of :ssh_identity_file - config[:ssh_identity_file] = get_stripped_unfrozen_value(config[:ssh_identity_file] || config[:identity_file] || Chef::Config[:knife][:ssh_identity_file]) + config[:ssh_identity_file] = get_stripped_unfrozen_value(config[:ssh_identity_file] || Chef::Config[:knife][:ssh_identity_file]) end def configure_ssh_gateway_identity |