From: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Date: Wed, 9 Oct 2019 23:15:37 +0000 (+0200)
Subject: tasks/ceph: drop testdir replacement in skeleton_config
X-Git-Tag: v14.2.10~17^2~85
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8bfb5ed7c2f908efde0d7133acd2287e9bb0b50c;p=ceph.git

tasks/ceph: 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>
(cherry picked from commit f1a96b55dc9b383810cbae6b2c4e953806ed9313)
---

diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index e38f7c62edf..791787865ac 100644
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@ -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)