import ceph quincy 17.2.1

[ceph.git] / ceph / src / ceph-volume / ceph_volume / devices / lvm / zap.py

diff --git a/ceph/src/ceph-volume/ceph_volume/devices/lvm/zap.py b/ceph/src/ceph-volume/ceph_volume/devices/lvm/zap.py
index e0cbfb172194063662c06b14637ba049c3cfde66..9f8141d5406ce7aefda66d9bb7c7bb7c856fd61c 100644 (file)
--- a/ceph/src/ceph-volume/ceph_volume/devices/lvm/zap.py
+++ b/ceph/src/ceph-volume/ceph_volume/devices/lvm/zap.py
@@ -168,6 +168,7 @@ class Zap(object):
         """
         lv = api.get_single_lv(filters={'lv_name': device.lv_name, 'vg_name':
                                         device.vg_name})
+        pv = api.get_single_pv(filters={'lv_uuid': lv.lv_uuid})
         self.unmount_lv(lv)
 
         wipefs(device.abspath)
@@ -182,6 +183,7 @@ class Zap(object):
                 mlogger.info('Only 1 LV left in VG, will proceed to destroy '
                              'volume group %s', device.vg_name)
                 api.remove_vg(device.vg_name)
+                api.remove_pv(pv.pv_name)
             else:
                 mlogger.info('More than 1 LV left in VG, will proceed to '
                              'destroy LV only')
@@ -362,7 +364,7 @@ class Zap(object):
             'devices',
             metavar='DEVICES',
             nargs='*',
-            type=arg_validators.ValidDevice(gpt_ok=True),
+            type=arg_validators.ValidZapDevice(gpt_ok=True),
             default=[],
             help='Path to one or many lv (as vg/lv), partition (as /dev/sda1) or device (as /dev/sda)'
         )