Skip to content

Commit a075397

Browse files
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]>
1 parent 628159f commit a075397

File tree

1 file changed

+9
-3
lines changed
  • src/rookify/modules/migrate_rgws

1 file changed

+9
-3
lines changed

src/rookify/modules/migrate_rgws/main.py

+9-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ def _get_rgw_daemon_hosts(self) -> List[str]:
1414
state_data = self.machine.get_preflight_state("AnalyzeCephHandler").data
1515

1616
return self._get_rgw_daemon_hosts_of_map(
17-
state_data["report"]["servicemap"]["services"]["rgw"]["daemons"]
17+
state_data["report"]["servicemap"]["services"]
18+
.get("rgw", {})
19+
.get("daemons", {})
1820
)
1921

2022
def _get_rgw_daemon_hosts_of_map(
@@ -101,7 +103,9 @@ def _migrate_rgw(self, rgw_host: str) -> None:
101103
ceph_status = self.ceph.mon_command("status")
102104

103105
rgw_daemon_hosts = self._get_rgw_daemon_hosts_of_map(
104-
ceph_status["servicemap"]["services"]["rgw"]["daemons"]
106+
ceph_status["servicemap"]["services"]
107+
.get("rgw", {})
108+
.get("daemons", {})
105109
)
106110

107111
if rgw_host not in rgw_daemon_hosts:
@@ -140,7 +144,9 @@ def _migrate_rgw(self, rgw_host: str) -> None:
140144
ceph_status = self.ceph.mon_command("status")
141145

142146
rgw_daemon_hosts = self._get_rgw_daemon_hosts_of_map(
143-
ceph_status["servicemap"]["services"]["rgw"]["daemons"]
147+
ceph_status["servicemap"]["services"]
148+
.get("rgw", {})
149+
.get("daemons", {})
144150
)
145151

146152
if rgw_host in rgw_daemon_hosts:

0 commit comments

Comments
 (0)