summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsiddheshwar-more <siddheshwar.more@clogeny.com>2014-10-10 20:51:36 +0530
committersiddheshwar-more <siddheshwar.more@clogeny.com>2014-10-10 20:51:36 +0530
commit12d2d1b28cc2bf221631ba548bc0fbc29e765114 (patch)
tree7959f6e62a08403247b1bfd5930dfa36dcf3cdce
parent19cd53bcf0dad14c8def6aaf719f548b86d46164 (diff)
downloadchef-12d2d1b28cc2bf221631ba548bc0fbc29e765114.tar.gz
Changes to fix review comments
-rw-r--r--lib/chef/knife/bootstrap.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb
index 7552156ba5..6036782d8d 100644
--- a/lib/chef/knife/bootstrap.rb
+++ b/lib/chef/knife/bootstrap.rb
@@ -280,14 +280,14 @@ class Chef
ssh = Chef::Knife::Ssh.new
ssh.ui = ui
ssh.name_args = [ server_name, ssh_command ]
- ssh.config[:ssh_user] = config[:ssh_user] || Chef::Config[:knife][:ssh_user]
+ ssh.config[:ssh_user] = config[:ssh_user]
ssh.config[:ssh_password] = config[:ssh_password]
- ssh.config[:ssh_port] = config[:ssh_port] || Chef::Config[:knife][:ssh_port]
- ssh.config[:ssh_gateway] = config[:ssh_gateway] || Chef::Config[:knife][:ssh_gateway]
- ssh.config[:forward_agent] = config[:forward_agent] || Chef::Config[:knife][:forward_agent]
- ssh.config[:identity_file] = config[:identity_file] || Chef::Config[:knife][:identity_file]
+ 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]
ssh.config[:manual] = true
- ssh.config[:host_key_verify] = config[:host_key_verify] || Chef::Config[:knife][:host_key_verify]
+ ssh.config[:host_key_verify] = config[:host_key_verify]
ssh.config[:on_error] = :raise
ssh
end