From: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>
Date: Wed, 9 Oct 2019 23:06:11 +0000 (+0200)
Subject: misc: drop testdir replacement in skeleton_config
X-Git-Tag: 1.1.0~216^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=31fa90a43dc6290e498ba5bfb36a0d232a64ad2f;p=teuthology.git

misc: drop testdir replacement in skeleton_config

The str.format is not used anymore for ceph.conf.template

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

diff --git a/teuthology/misc.py b/teuthology/misc.py
index 832c726e89..2f01fd654d 100644
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -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)