Fix paramiko for when no private key is specified

parent ea45423f
...@@ -81,8 +81,12 @@ class Connection(object): ...@@ -81,8 +81,12 @@ class Connection(object):
if self.runner.remote_pass is not None: if self.runner.remote_pass is not None:
allow_agent = False allow_agent = False
try: 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, 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) timeout=self.runner.timeout, port=self.port)
except Exception, e: except Exception, e:
msg = str(e) msg = str(e)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment