From 5447896b664aa2028f9dfad682bfae4ddf992b52 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Mon, 26 Oct 2015 17:35:34 +0900 Subject: [PATCH] openstack: increase ssh timeout to 240 When the connectivity is not great, this is required. Signed-off-by: Loic Dachary --- teuthology/openstack/__init__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py index d0a4ba246a..24c1bac35d 100644 --- 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): -- 2.39.5