From 677cbbb059185fe2808746b36bd3f988ff2af41c Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Tue, 13 Nov 2018 08:30:23 -0500 Subject: [PATCH] ceph-volume lvm.zap remove vgs|lvs when --destroy is used Signed-off-by: Alfredo Deza --- src/ceph-volume/ceph_volume/devices/lvm/zap.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/ceph-volume/ceph_volume/devices/lvm/zap.py b/src/ceph-volume/ceph_volume/devices/lvm/zap.py index 70a24f0f776..8e0e3a3c5e9 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/zap.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/zap.py @@ -108,8 +108,19 @@ class Zap(object): zap_data(path) if lv and not pvs: - # remove all lvm metadata - lv.clear_tags() + if args.destroy: + lvs = api.Volumes() + lvs.filter(vg_name=lv.vg_name) + if len(lvs) <= 1: + mlogger.info('Only 1 LV left in VG, will proceed to destroy volume group %s', lv.vg_name) + api.remove_vg(lv.vg_name) + else: + mlogger.info('More than 1 LV left in VG, will proceed to destroy LV only') + mlogger.info('Removing LV because --destroy was given: %s', lv) + api.remove_lv(lv) + else: + # just remove all lvm metadata, leaving the LV around + lv.clear_tags() terminal.success("Zapping successful for: %s" % ", ".join(args.devices)) -- 2.39.5