From 64659882d78ad4376573fc21ef5107dfb324bba2 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Thu, 22 Feb 2018 11:01:10 -0600 Subject: [PATCH] ceph-volume: use lv.encrypted property with lvm zap Signed-off-by: Andrew Schoen --- src/ceph-volume/ceph_volume/devices/lvm/zap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ceph-volume/ceph_volume/devices/lvm/zap.py b/src/ceph-volume/ceph_volume/devices/lvm/zap.py index 279419c2e5377..ee5cdf97b6a59 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/zap.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/zap.py @@ -72,7 +72,7 @@ class Zap(object): if lv: osd_path = "/var/lib/ceph/osd/{}-{}".format(lv.tags['ceph.cluster_name'], lv.tags['ceph.osd_id']) dmcrypt_uuid = lv.lv_uuid - dmcrypt = lv.tags.get('ceph.encrypted', '0') == '1' + dmcrypt = lv.encrypted if system.path_is_mounted(osd_path): mlogger.info("Unmounting %s", osd_path) system.unmount(osd_path) -- 2.39.5