]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: kick serve loop to trigger ceph.conf deployment 36849/head
authorSebastian Wagner <sebastian.wagner@suse.com>
Thu, 27 Aug 2020 09:33:31 +0000 (11:33 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Thu, 27 Aug 2020 09:33:31 +0000 (11:33 +0200)
Otherwise we'll wait 600s.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
src/pybind/mgr/cephadm/module.py

index 149140a540ff0adf584f0473874cb2dbf9f48ae5..bf97d2a18cad243615f8acb8abbc79e4c9e3e95f 100644 (file)
@@ -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()