From df574359c44fea165985b61f4442867a83074ef7 Mon Sep 17 00:00:00 2001 From: Federico Ressi Date: Wed, 11 Mar 2020 11:03:46 +0100 Subject: [PATCH] Resolve overcloud key file path relative to tobiko.conf file Change-Id: I36fd159b0e1c3c7f3fdf01880549410291edc175 --- tobiko/tests/functional/tripleo/test_overcloud.py | 2 +- tobiko/tripleo/overcloud.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tobiko/tests/functional/tripleo/test_overcloud.py b/tobiko/tests/functional/tripleo/test_overcloud.py index 1cb9944e7..3c0fdb471 100644 --- a/tobiko/tests/functional/tripleo/test_overcloud.py +++ b/tobiko/tests/functional/tripleo/test_overcloud.py @@ -78,7 +78,7 @@ class OvercloudNovaApiTest(testtools.TestCase): host_config.port) self.assertEqual(CONF.tobiko.tripleo.overcloud_ssh_username, host_config.username) - key_filename = os.path.expanduser( + key_filename = tobiko.tobiko_config_path( CONF.tobiko.tripleo.overcloud_ssh_key_filename) self.assertEqual(key_filename, host_config.key_filename) self.assertTrue(os.path.isfile(key_filename)) diff --git a/tobiko/tripleo/overcloud.py b/tobiko/tripleo/overcloud.py index 6d7f5ca44..e373771f1 100644 --- a/tobiko/tripleo/overcloud.py +++ b/tobiko/tripleo/overcloud.py @@ -89,7 +89,7 @@ class OvercloudSshKeyFileFixture(tobiko.SharedFixture): @property def key_filename(self): - return os.path.expanduser( + return tobiko.tobiko_config_path( CONF.tobiko.tripleo.overcloud_ssh_key_filename) def setup_fixture(self):