mgr/cephadm: move _serve_sleep to serve.py

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

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 930268decdb1ba0f2ac6c21792bafe5f6cfc1230..b54cbde671ad5efb1f7a69496d3b5a4c09a31c3a 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -506,12 +506,6 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
                 }
         self.set_health_checks(self.health_checks)
 
-    def _serve_sleep(self):
-        sleep_interval = 600
-        self.log.debug('Sleeping for %d seconds', sleep_interval)
-        ret = self.event.wait(sleep_interval)
-        self.event.clear()
-
     def serve(self) -> None:
         """
         The main loop of cephadm.

diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py
index fb81efa71335d84008754d942b2dd6c4844b7d8f..66f2ddbc950c643c71611079f26e882b8379dc8e 100644 (file)
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@ -63,5 +63,11 @@ class CephadmServe:
                 if e.event_subject:
                     self.mgr.events.from_orch_error(e)
 
-            self.mgr._serve_sleep()
+            self._serve_sleep()
         self.log.debug("serve exit")
+
+    def _serve_sleep(self):
+        sleep_interval = 600
+        self.log.debug('Sleeping for %d seconds', sleep_interval)
+        ret = self.mgr.event.wait(sleep_interval)
+        self.mgr.event.clear()