From: Kefu Chai <kchai@redhat.com>
Date: Fri, 18 Oct 2019 08:06:23 +0000 (+0800)
Subject: Merge pull request #30829 from kshtsk/wip-misc-drop-legacy-code-in-skeleton_config
X-Git-Tag: v15.1.0~1227
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0a8448e0c7ba1915acaa7ff6017e2832f56f4b12;p=ceph.git

Merge pull request #30829 from kshtsk/wip-misc-drop-legacy-code-in-skeleton_config

tasks/ceph: drop testdir replacement in skeleton_config

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

0a8448e0c7ba1915acaa7ff6017e2832f56f4b12
diff --cc qa/tasks/ceph.py
index d82f2f23ce1d,061ecaee8bef..21713eed131a
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@@ -479,11 -479,9 +479,9 @@@ def skeleton_config(ctx, roles, ips, mo
      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.iteritems():
 +    for role, addr in mons.items():
          mon_cluster, _, _ = teuthology.split_role(role)
          if mon_cluster != cluster:
              continue