valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

paramiko.SSHClient.connect() doesn't actually return a boolean on success

Browse Source
This commit is contained in:
mafro 2012-11-15 02:39:03 +00:00
parent 187e01dcd9
commit b4d7695885
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
saltcloud/utils/__init__.py
View File

@ -178,7 +178,7 @@ def wait_for_passwd(host, port=22, timeout=900, username='root',
'''
trycount=0
while trycount < maxtries:
tryconnect = None
connectfail = False
try:
ssh = paramiko.SSHClient()
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
@ -191,8 +191,9 @@ def wait_for_passwd(host, port=22, timeout=900, username='root',
if key_filename:
kwargs['key_filename'] = key_filename
try:
tryconnect = ssh.connect(**kwargs)
ssh.connect(**kwargs)
except (paramiko.AuthenticationException, paramiko.SSHException) as authexc:
connectfail = True
ssh.close()
trycount += 1
print('Attempting to authenticate (try {0} of {1}): {2}'.format(trycount, maxtries, authexc))
@ -207,7 +208,7 @@ def wait_for_passwd(host, port=22, timeout=900, username='root',
except Exception as exc:
print('There was an error in wait_for_passwd: {0}'.format(exc))
log.error('There was an error in wait_for_passwd: {0}'.format(exc))
if tryconnect:
if connectfail == False:
return True
return False
except Exception: