]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
misc: drop testdir replacement in skeleton_config 1323/head
authorKyr Shatskyy <kyrylo.shatskyy@gmail.com>
Wed, 9 Oct 2019 23:06:11 +0000 (01:06 +0200)
committerKyr Shatskyy <kyrylo.shatskyy@gmail.com>
Wed, 9 Oct 2019 23:06:11 +0000 (01:06 +0200)
The str.format is not used anymore for ceph.conf.template

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
teuthology/misc.py

index 832c726e8976e749ac52d8bb4ef762dae19f0287..2f01fd654d753e3446b6aa1b53a0edd3564c3d00 100644 (file)
@@ -325,9 +325,7 @@ def skeleton_config(ctx, roles, ips, 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=get_testdir(ctx))
-    conf = configobj.ConfigObj(StringIO(skconf), file_error=True)
+    conf = configobj.ConfigObj(path, file_error=True)
     mons = get_mons(roles=roles, ips=ips,
                     mon_bind_msgr2=mon_bind_msgr2,
                     mon_bind_addrvec=mon_bind_addrvec)