From: Paul Cuzner <pcuzner@redhat.com>
Date: Wed, 10 Feb 2021 22:31:22 +0000 (+1300)
Subject: mgr/cephadm: added config checker to main serve loop
X-Git-Tag: v17.1.0~2673^2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3ea8eaf9b5e0e60edd06da927e3c6f375687dbb1;p=ceph.git

mgr/cephadm: added config checker to main serve loop

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
---

diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py
index 07e564bbd23a..8af36fba473a 100644
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@ -53,6 +53,7 @@ class CephadmServe:
     def __init__(self, mgr: "CephadmOrchestrator"):
         self.mgr: "CephadmOrchestrator" = mgr
         self.log = logger
+        self.config_checker = CephadmConfigChecks(self.mgr)
 
     def serve(self) -> None:
         """
@@ -62,6 +63,8 @@ class CephadmServe:
         of cephadm. This loop will then attempt to apply this new state.
         """
         self.log.debug("serve starting")
+        self.config_checker.load_network_config()
+
         while self.mgr.run:
 
             try:
@@ -182,8 +185,7 @@ class CephadmServe:
 
         refresh(self.mgr.cache.get_hosts())
 
-        checker = CephadmConfigChecks(self.mgr)
-        checker.run_checks()
+        self.config_checker.run_checks()
 
         health_changed = False
         for k in [