From ca767fc3a8d861d35efd8f331a8ddf275f3beb8c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 5 Nov 2021 14:36:54 -0400 Subject: [PATCH] mgr/cephadm: allow zapping devices from other clusters This is the 99% of the devices that ever get zapped. Fixes: b7782084ac9657be9b2da6ebd56b5029cf859225 Signed-off-by: Sage Weil --- src/pybind/mgr/cephadm/module.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index 5b82e625a29..b3a7da5abc9 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -2030,15 +2030,6 @@ Then run the following: for dev in host_devices: if dev.path == path: - # match, so look a little deeper - if dev.lvs: - for lv in cast(List[Dict[str, str]], dev.lvs): - if lv.get('osd_id', ''): - lv_fsid = lv.get('cluster_fsid') - if lv_fsid != self._cluster_fsid: - raise OrchestratorError( - f"device {path} has lv's from a different Ceph cluster ({lv_fsid})") - osd_id_list.append(lv.get('osd_id', '')) path_found = True break if not path_found: -- 2.39.5