Fix paramiko for when no private key is specified

2013-01-21 21:48:02 +01:00 · 2013-01-21 21:48:02 +01:00 · 35b58955d6
parent ea45423f92
commit 35b58955d6
1 changed files with 5 additions and 1 deletions
--- a/lib/ansible/runner/connection_plugins/paramiko_ssh.py
+++ b/lib/ansible/runner/connection_plugins/paramiko_ssh.py
@ -81,8 +81,12 @@ class Connection(object):
        if self.runner.remote_pass is not None:
            allow_agent = False
        try:
+            if self.runner.private_key_file:
+                key_filename = os.path.expanduser(self.runner.private_key_file)
+            else:
+                key_filename = None
            ssh.connect(self.host, username=user, allow_agent=allow_agent, look_for_keys=True,
-                key_filename=os.path.expanduser(self.runner.private_key_file), password=self.runner.remote_pass,
+                key_filename=key_filename, password=self.runner.remote_pass,
                timeout=self.runner.timeout, port=self.port)
        except Exception, e:
            msg = str(e)