Skip to content

Commit fd8a05b

Browse files
committed
cephadm: check "ceph_device_lvm" field instead of "ceph_device" during zap
This field was renamed as part of ceph@4941d09 but the cephadm piece was still looking for "ceph_device" meaning we would never zap any devices. Worth noting this won't get caught by teuthology as we make OSDs in that env directly on top of LVs made out of a split up nvme drive and ceph-volume inventory doesn't list LVs. Signed-off-by: Adam King <[email protected]>
1 parent 5549c10 commit fd8a05b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/cephadm/cephadm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3936,7 +3936,7 @@ def _zap_osds(ctx: CephadmContext) -> None:
39363936
raise Error(f'Invalid JSON in ceph-volume inventory: {e}')
39373937

39383938
for i in ls:
3939-
matches = [lv.get('cluster_fsid') == ctx.fsid and i.get('ceph_device') for lv in i.get('lvs', [])]
3939+
matches = [lv.get('cluster_fsid') == ctx.fsid and i.get('ceph_device_lvm') for lv in i.get('lvs', [])]
39403940
if any(matches) and all(matches):
39413941
_zap(ctx, i.get('path'))
39423942
elif any(matches):

0 commit comments

Comments
 (0)