More helpful message when ssh fails.

This commit is contained in:
John Kleint 2012-06-01 17:16:02 -04:00
parent 0c0d8f5db2
commit 56de49b725

View file

@ -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