From: Sage Weil <sage@redhat.com>
Date: Fri, 27 Mar 2020 15:43:11 +0000 (-0500)
Subject: qa/tasks/cephadm: no need to explicitly reconfig
X-Git-Tag: v16.1.0~2745^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F34248%2Fhead;p=ceph.git

qa/tasks/cephadm: no need to explicitly reconfig

cephadm does this magically now.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 456d22907054..50a834a87528 100644
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -529,20 +529,6 @@ def ceph_mons(ctx, config):
         )
         ctx.ceph[cluster_name].config_file = r.stdout.getvalue()
 
-        # refresh ceph.conf files for all mons + first mgr
-        for remote, roles in ctx.cluster.remotes.items():
-            for mon in [r for r in roles
-                        if teuthology.is_type('mon', cluster_name)(r)]:
-                c_, _, id_ = teuthology.split_role(mon)
-                _shell(ctx, cluster_name, remote, [
-                    'ceph', 'orch', 'daemon', 'reconfig',
-                    'mon.' + id_,
-                ])
-        _shell(ctx, cluster_name, ctx.ceph[cluster_name].bootstrap_remote, [
-            'ceph', 'orch', 'daemon', 'reconfig',
-            'mgr.' + ctx.ceph[cluster_name].first_mgr,
-        ])
-
         yield
 
     finally: