From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Thu, 27 Aug 2020 09:33:31 +0000 (+0200)
Subject: mgr/cephadm: kick serve loop to trigger ceph.conf deployment
X-Git-Tag: v16.1.0~1282^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4609210e105cbbe2d5f685fc4890cce8d8b0ba6f;p=ceph.git

mgr/cephadm: kick serve loop to trigger ceph.conf deployment

Otherwise we'll wait 600s.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 149140a540ff..bf97d2a18cad 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -561,6 +561,9 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
                 monmap['modified'], CEPH_DATEFMT)
             if self.last_monmap and self.last_monmap > datetime.datetime.utcnow():
                 self.last_monmap = None  # just in case clocks are skewed
+            if getattr(self, 'manage_etc_ceph_ceph_conf', False):
+                # getattr, due to notify() being called before config_notify()
+                self._kick_serve_loop()
         if notify_type == "pg_summary":
             self._trigger_osd_removal()