]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
openstack: use ssh identity as key_filename by default 1206/head
authorKyr Shatskyy <kyrylo.shatskyy@gmail.com>
Fri, 14 Sep 2018 00:27:42 +0000 (02:27 +0200)
committerKyr Shatskyy <kyrylo.shatskyy@gmail.com>
Fri, 14 Sep 2018 00:27:42 +0000 (02:27 +0200)
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
teuthology/openstack/__init__.py

index a13c4cf61d412074a4f85263e8a060ff858fcbd8..0b754627eb813f90f7791aa3a1ba6e6305441c29 100644 (file)
@@ -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