diff options
| author | Tim Smith <tsmith@chef.io> | 2018-10-26 13:01:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-26 13:01:32 -0700 |
| commit | 8f158e9e11bbedd53697c3b98de7b1bb540e6c35 (patch) | |
| tree | 1f82fb9cb80536a689210d40b2688679f6c61890 | |
| parent | 31fe4555a5d8efb6e5678687afdb62ee1e482278 (diff) | |
| parent | 5fbcc2e2b8f1ca172899a4e6b3495f22a67fd4cb (diff) | |
| download | chef-8f158e9e11bbedd53697c3b98de7b1bb540e6c35.tar.gz | |
Merge pull request #7489 from chef/bootstrap_identity_file
Remove the deprecated knife bootstrap --identity-file flag
| -rw-r--r-- | chef-config/lib/chef-config/config.rb | 1 | ||||
| -rw-r--r-- | lib/chef/knife/bootstrap.rb | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/chef-config/lib/chef-config/config.rb b/chef-config/lib/chef-config/config.rb index 0046d25f78..2976e27322 100644 --- a/chef-config/lib/chef-config/config.rb +++ b/chef-config/lib/chef-config/config.rb @@ -767,7 +767,6 @@ module ChefConfig default :bootstrap_template, nil default :secret, nil default :secret_file, nil - default :identity_file, nil default :host_key_verify, nil default :forward_agent, nil default :sort_status_reverse, nil diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb index bdeee3394b..19ae78cff5 100644 --- a/lib/chef/knife/bootstrap.rb +++ b/lib/chef/knife/bootstrap.rb @@ -78,10 +78,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", @@ -440,7 +436,7 @@ class Chef ssh.config[:ssh_gateway] = config[:ssh_gateway] ssh.config[:ssh_gateway_identity] = config[:ssh_gateway_identity] ssh.config[:forward_agent] = config[:forward_agent] - ssh.config[:ssh_identity_file] = config[:ssh_identity_file] || config[:identity_file] + ssh.config[:ssh_identity_file] = config[:ssh_identity_file] ssh.config[:manual] = true ssh.config[:host_key_verify] = config[:host_key_verify] ssh.config[:on_error] = true |