Commit 56de49b7 by John Kleint

More helpful message when ssh fails.

parent 0c0d8f5d
...@@ -65,10 +65,15 @@ class ParamikoConnection(object): ...@@ -65,10 +65,15 @@ class ParamikoConnection(object):
port=self.port port=self.port
) )
except Exception, e: except Exception, e:
if str(e).find("PID check failed") != -1: msg = str(e)
if "PID check failed" in msg:
raise errors.AnsibleError("paramiko version issue, please upgrade paramiko on the machine running ansible") raise errors.AnsibleError("paramiko version issue, please upgrade paramiko on the machine running ansible")
elif "Private key file is encrypted" in msg:
msg = 'ssh %s@%s:%s : %s\nTo connect as a different user, use -u <username>.' % (
user, self.host, self.port, msg)
raise errors.AnsibleConnectionFailed(msg)
else: else:
raise errors.AnsibleConnectionFailed(str(e)) raise errors.AnsibleConnectionFailed(msg)
return ssh return ssh
......
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