From f2bc6ec999bdd40befe07532625fffc1c5f95404 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 8 Jul 2020 01:04:10 +0200 Subject: [PATCH] ceph_volume: fix regression do not skip zapping if osd_fsid is passed Signed-off-by: Guillaume Abrioux (cherry picked from commit f402ab2b87813f0f9c3fba661a52f5afebc19723) --- library/ceph_volume.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/library/ceph_volume.py b/library/ceph_volume.py index a3eb630b2..1fcd6eafd 100644 --- a/library/ceph_volume.py +++ b/library/ceph_volume.py @@ -625,18 +625,22 @@ def run_module(): # Zap the OSD skip = [] for device_type in ['journal','data', 'db', 'wal']: + # 1/ if we passed vg/lv if module.params.get('{}_vg'.format(device_type), None) and module.params.get(device_type, None): + # 2/ check this is an actual lv/vg ret = is_lv(module, module.params['{}_vg'.format(device_type)], module.params[device_type], container_image) skip.append(ret) + # 3/ This isn't a lv/vg device if not ret: module.params['{}_vg'.format(device_type)] = False module.params[device_type] = False + # 4/ no journal|data|db|wal|_vg was passed, so it must be a raw device elif not module.params.get('{}_vg'.format(device_type), None) and module.params.get(device_type, None): skip.append(True) cmd = zap_devices(module, container_image) - if any(skip): + if any(skip) or module.params.get('osd_fsid', None): rc, cmd, out, err = exec_command( module, cmd) else: