From 447be1c9cc3a8f83687f8c0d2378dfd175e03959 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Tue, 21 Aug 2018 10:58:44 -0400 Subject: [PATCH] ceph-volume devices.lvm zap should skip when lv_uuid doesn't exist Signed-off-by: Alfredo Deza --- src/ceph-volume/ceph_volume/devices/lvm/zap.py | 6 ++++-- 1 file changed, 4 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 b640f76d4a9..12847072092 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/zap.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/zap.py @@ -50,7 +50,7 @@ class Zap(object): if lv.tags.get('ceph.cluster_name') and lv.tags.get('ceph.osd_id'): lv_path = "/var/lib/ceph/osd/{}-{}".format(lv.tags['ceph.cluster_name'], lv.tags['ceph.osd_id']) else: - lv_path = lv.path + lv_path = lv.lv_path dmcrypt_uuid = lv.lv_uuid dmcrypt = lv.encrypted if system.path_is_mounted(lv_path): @@ -89,7 +89,9 @@ class Zap(object): vgs = set([pv.vg_name for pv in pvs]) for pv in pvs: vg_name = pv.vg_name - lv = api.get_lv(vg_name=vg_name, lv_uuid=pv.lv_uuid) + lv = None + if pv.lv_uuid: + lv = api.get_lv(vg_name=vg_name, lv_uuid=pv.lv_uuid) if lv: self.unmount_lv(lv) -- 2.39.5