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

Otherwise we'll wait 600s.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 4609210e105cbbe2d5f685fc4890cce8d8b0ba6f)

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 1c66cdedb6c2c575029a5d9feb11dd8bb60f9467..4669a83f0425e3f6de270bf80d6d1f5faa2092d1 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -562,6 +562,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()