From: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>
Date: Fri, 14 Sep 2018 00:27:42 +0000 (+0200)
Subject: openstack: use ssh identity as key_filename by default
X-Git-Tag: 1.1.0~306^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1206%2Fhead;p=teuthology.git

openstack: use ssh identity as key_filename by default

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
---

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