Merge pull request #4023 from higanworks/part_of_3959

pass ssh_password to session

1 files changed, 2 insertions, 0 deletions

diff --git a/lib/chef/knife/ssh.rb b/lib/chef/knife/ssh.rb
index 62af853e88..d2df8399db 100644
--- a/lib/chef/knife/ssh.rb
+++ b/lib/chef/knife/ssh.rb
@@ -225,6 +225,8 @@ class Chef
           if config[:identity_file]
             opts[:keys] = File.expand_path(config[:identity_file])
             opts[:keys_only] = true
+          elsif config[:ssh_password]
+            opts[:password] = config[:ssh_password]
           end
           # Don't set the keys to nil if we don't have them.
           forward_agent = config[:forward_agent] || ssh_config[:forward_agent]