From 1017722ab3044bbcc208f3e22369e583c61f4e92 Mon Sep 17 00:00:00 2001 From: Kyr Shatskyy Date: Fri, 14 Sep 2018 02:27:42 +0200 Subject: [PATCH] openstack: use ssh identity as key_filename by default Signed-off-by: Kyr Shatskyy --- teuthology/openstack/__init__.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py index a13c4cf61..0b754627e 100644 --- a/teuthology/openstack/__init__.py +++ b/teuthology/openstack/__init__.py @@ -528,7 +528,13 @@ class TeuthologyOpenStack(OpenStack): """ self.setup_logs() set_config_attr(self.args) - self.key_filename = self.args.key_filename + for keyfile in [self.args.key_filename, + os.environ['HOME'] + '/.ssh/id_rsa', + os.environ['HOME'] + '/.ssh/id_dsa', + os.environ['HOME'] + '/.ssh/id_ecdsa']: + if (keyfile and os.path.isfile(keyfile)): + self.key_filename = keyfile + break self.verify_openstack() self.setup() exit_code = 0 -- 2.47.3