]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/cephadm: no need to explicitly reconfig
authorSage Weil <sage@redhat.com>
Fri, 27 Mar 2020 15:43:11 +0000 (10:43 -0500)
committerSebastian Wagner <sebastian.wagner@suse.com>
Tue, 7 Apr 2020 09:36:27 +0000 (11:36 +0200)
cephadm does this magically now.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 65ad142d59b40f2c87fbfa9b593a7f4c367d3c42)

qa/tasks/cephadm.py

index 61ee8d8a9feecbdecf84f6bdc3f968c11dc6c5e5..666dae824d8e84c02ba30de54f6593a3d838685e 100644 (file)
@@ -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: