From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Fri, 11 Sep 2020 10:49:02 +0000 (+0200)
Subject: mgr/cephadm: move _serve_sleep to serve.py
X-Git-Tag: v15.2.8~14^2~33
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1db237ed87bc92a6a1066d6b449ccead7a2b2241;p=ceph.git

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 930268decdb1b..b54cbde671ad5 100644
--- 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 fb81efa71335d..66f2ddbc950c6 100644
--- 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()