openstack: increase ssh timeout to 240

When the connectivity is not great, this is required.

Signed-off-by: Loic Dachary <ldachary@redhat.com>

diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py
index d0a4ba246a54024fd530339877376b5b51d84969..24c1bac35d9d7c80554fff0bf535aa739016b185 100644 (file)
--- a/teuthology/openstack/__init__.py
+++ b/teuthology/openstack/__init__.py
@@ -415,6 +415,7 @@ ssh access   : ssh {identity}{username}@{ip} # logs in /usr/share/nginx/html
         client_args = {
             'user_at_host': '@'.join((self.username, ip)),
             'retry': False,
+            'timeout': 240,
         }
         if self.key_filename:
             log.debug("ssh overriding key with " + self.key_filename)
@@ -425,11 +426,11 @@ ssh access   : ssh {identity}{username}@{ip} # logs in /usr/share/nginx/html
         out = ''
         try:
             out = stdout.read()
-            log.debug('teardown stdout ' + command + ' ' + out)
+            log.debug('ssh stdout ' + command + ' ' + out)
         except Exception:
-            log.exception('teardown ' + command + ' failed')
+            log.exception('ssh ' + command + ' failed')
         err = stderr.read()
-        log.debug('teardown stderr ' + command + ' ' + err)
+        log.debug('ssh stderr ' + command + ' ' + err)
         return out + ' ' + err
 
     def verify_openstack(self):