From 624a7885319ea71e0e1eef760d490871748d2967 Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Wed, 25 Oct 2017 16:38:54 +0200 Subject: testbeds: Complete support for exogeni VMs on jfed Selecting "exogeni.net" as an authority for jfed should now work. --- rumba/ssh_support.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'rumba/ssh_support.py') diff --git a/rumba/ssh_support.py b/rumba/ssh_support.py index eff837d..d9be604 100644 --- a/rumba/ssh_support.py +++ b/rumba/ssh_support.py @@ -81,10 +81,6 @@ def ssh_connect(hostname, port, username, password, time_out, proxy_server): ssh_client.connect(hostname, port, username, password, look_for_keys=True, timeout=time_out, sock=proxy) return ssh_client - except (paramiko.ssh_exception.SSHException, EOFError): - retry += 1 - logger.error('Failed to connect to host, retrying: ' + - str(retry) + '/' + str(max_retries) + ' retries') except paramiko.ssh_exception.BadHostKeyException: retry += 1 logger.error(hostname + ' has a mismatching entry in ' + @@ -92,6 +88,10 @@ def ssh_connect(hostname, port, username, password, time_out, proxy_server): logger.error('If you are sure this is not a man in the ' + 'middle attack, edit that file to remove the ' + 'entry and then hit return to try again.') + except (paramiko.ssh_exception.SSHException, EOFError): + retry += 1 + logger.error('Failed to connect to host, retrying: ' + + str(retry) + '/' + str(max_retries) + ' retries') input('Hit Enter when ready') if retry == max_retries: raise SSHException('Failed to connect to host') -- cgit v1.2.3