]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: added config checker to main serve loop
authorPaul Cuzner <pcuzner@redhat.com>
Wed, 10 Feb 2021 22:31:22 +0000 (11:31 +1300)
committerSage Weil <sage@newdream.net>
Tue, 16 Mar 2021 12:56:17 +0000 (07:56 -0500)
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 3ea8eaf9b5e0e60edd06da927e3c6f375687dbb1)

src/pybind/mgr/cephadm/serve.py

index fc399dc450f063d483d205437a91e9b949095754..e74282e9f31d6d672d0ec2fe0640c9da6e37dd67 100644 (file)
@@ -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 [