More helpful message when ssh fails.

pull/603/head
John Kleint 13 years ago
parent 9ff59090c2
commit e9f770fa11

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

Loading…
Cancel
Save