mgr/cephadm: move _refresh_host_osdspec_previews to serve.py

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

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 84708ed96c9d108faf2272caa65662c41fce2863..fd464fccf53acaaa6bb4267c75f46e60d6a8a99e 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1346,24 +1346,6 @@ To check that the host is reachable:
         self.log.info(msg)
         return msg
 
-    def update_osdspec_previews(self, search_host: str = ''):
-        # Set global 'pending' flag for host
-        self.cache.loading_osdspec_preview.add(search_host)
-        previews = []
-        # query OSDSpecs for host <search host> and generate/get the preview
-        # There can be multiple previews for one host due to multiple OSDSpecs.
-        previews.extend(self.osd_service.get_previews(search_host))
-        self.log.debug(f"Loading OSDSpec previews to HostCache")
-        self.cache.osdspec_previews[search_host] = previews
-        # Unset global 'pending' flag for host
-        self.cache.loading_osdspec_preview.remove(search_host)
-
-    def _refresh_host_osdspec_previews(self, host) -> bool:
-        self.update_osdspec_previews(host)
-        self.cache.save_host(host)
-        self.log.debug(f'Refreshed OSDSpec previews for host <{host}>')
-        return True
-
     def _deploy_etc_ceph_ceph_conf(self, host: str) -> Optional[str]:
         config = self.get_minimal_ceph_conf()
 

diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py
index 8fde738fcfc1d8912994ae1f45925403ec60e2e8..f957a40bf7a1d64ecc8cb95806ee3432b56a27b3 100644 (file)
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@ -109,7 +109,7 @@ class CephadmServe:
 
             if self.mgr.cache.host_needs_osdspec_preview_refresh(host):
                 self.log.debug(f"refreshing OSDSpec previews for {host}")
-                r = self.mgr._refresh_host_osdspec_previews(host)
+                r = self._refresh_host_osdspec_previews(host)
                 if r:
                     failures.append(r)
 
@@ -248,6 +248,24 @@ class CephadmServe:
             host, len(devices), len(networks)))
         devices = inventory.Devices.from_json(devices)
         self.mgr.cache.update_host_devices_networks(host, devices.devices, networks)
-        self.mgr.update_osdspec_previews(host)
+        self.update_osdspec_previews(host)
         self.mgr.cache.save_host(host)
         return None
+
+    def _refresh_host_osdspec_previews(self, host) -> bool:
+        self.update_osdspec_previews(host)
+        self.mgr.cache.save_host(host)
+        self.log.debug(f'Refreshed OSDSpec previews for host <{host}>')
+        return True
+
+    def update_osdspec_previews(self, search_host: str = ''):
+        # Set global 'pending' flag for host
+        self.mgr.cache.loading_osdspec_preview.add(search_host)
+        previews = []
+        # query OSDSpecs for host <search host> and generate/get the preview
+        # There can be multiple previews for one host due to multiple OSDSpecs.
+        previews.extend(self.mgr.osd_service.get_previews(search_host))
+        self.log.debug(f"Loading OSDSpec previews to HostCache")
+        self.mgr.cache.osdspec_previews[search_host] = previews
+        # Unset global 'pending' flag for host
+        self.mgr.cache.loading_osdspec_preview.remove(search_host)