]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tasks/ceph: drop testdir replacement in skeleton_config
authorKyr Shatskyy <kyrylo.shatskyy@suse.com>
Wed, 9 Oct 2019 23:15:37 +0000 (01:15 +0200)
committerKefu Chai <kchai@redhat.com>
Tue, 2 Jun 2020 02:32:23 +0000 (10:32 +0800)
The str.format is not used anymore for ceph.conf.template

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit f1a96b55dc9b383810cbae6b2c4e953806ed9313)

qa/tasks/ceph.py

index e38f7c62edf007223ed6f215d9e3cde6be6fd16d..791787865ac69bb029740677fe03de18dc4c7e7e 100644 (file)
@@ -466,9 +466,7 @@ def skeleton_config(ctx, roles, ips, mons, cluster='ceph'):
     Use conf.write to write it out, override .filename first if you want.
     """
     path = os.path.join(os.path.dirname(__file__), 'ceph.conf.template')
-    t = open(path, 'r')
-    skconf = t.read().format(testdir=teuthology.get_testdir(ctx))
-    conf = configobj.ConfigObj(StringIO(skconf), file_error=True)
+    conf = configobj.ConfigObj(path, file_error=True)
     mon_hosts = []
     for role, addr in mons.items():
         mon_cluster, _, _ = teuthology.split_role(role)