Be more permissive for Ceph RGW services to be empty in migrate_rgws

* Be more permissive for Ceph RGW services to be empty in `migrate_rgws` * Ensure we are validating current Ceph status data for migration * Adapt to changes of PR #101 Fixes: #98 Signed-off-by: Tobias Wolf <[email protected]>
SovereignCloudStack · Nov 13, 2024 · a075397 · a075397
1 parent 628159f
commit a075397
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/rookify/modules/migrate_rgws/main.py b/src/rookify/modules/migrate_rgws/main.py
@@ -14,7 +14,9 @@ def _get_rgw_daemon_hosts(self) -> List[str]:
         state_data = self.machine.get_preflight_state("AnalyzeCephHandler").data
 
         return self._get_rgw_daemon_hosts_of_map(
-            state_data["report"]["servicemap"]["services"]["rgw"]["daemons"]
+            state_data["report"]["servicemap"]["services"]
+            .get("rgw", {})
+            .get("daemons", {})
         )
 
     def _get_rgw_daemon_hosts_of_map(
@@ -101,7 +103,9 @@ def _migrate_rgw(self, rgw_host: str) -> None:
                 ceph_status = self.ceph.mon_command("status")
 
                 rgw_daemon_hosts = self._get_rgw_daemon_hosts_of_map(
-                    ceph_status["servicemap"]["services"]["rgw"]["daemons"]
+                    ceph_status["servicemap"]["services"]
+                    .get("rgw", {})
+                    .get("daemons", {})
                 )
 
                 if rgw_host not in rgw_daemon_hosts:
@@ -140,7 +144,9 @@ def _migrate_rgw(self, rgw_host: str) -> None:
                 ceph_status = self.ceph.mon_command("status")
 
                 rgw_daemon_hosts = self._get_rgw_daemon_hosts_of_map(
-                    ceph_status["servicemap"]["services"]["rgw"]["daemons"]
+                    ceph_status["servicemap"]["services"]
+                    .get("rgw", {})
+                    .get("daemons", {})
                 )
 
                 if rgw_host in rgw_daemon_hosts: