From 3cf00cde820ec838e4fbda1799d2ce336c9e2d86 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 13 Nov 2024 16:23:36 +0100 Subject: [PATCH] ceph-volume: fix dmcrypt activation regression `ceph.with_tpm` tag is actually a `str`, which means that `bool('0')` will return `True`. Fixes: https://tracker.ceph.com/issues/68944 Signed-off-by: Guillaume Abrioux --- src/ceph-volume/ceph_volume/objectstore/lvmbluestore.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ceph-volume/ceph_volume/objectstore/lvmbluestore.py b/src/ceph-volume/ceph_volume/objectstore/lvmbluestore.py index ba3719cd3f3..aa11d553723 100644 --- a/src/ceph-volume/ceph_volume/objectstore/lvmbluestore.py +++ b/src/ceph-volume/ceph_volume/objectstore/lvmbluestore.py @@ -367,7 +367,7 @@ class LvmBlueStore(BlueStore): if is_encrypted: osd_lv_path = '/dev/mapper/%s' % osd_block_lv.__dict__['lv_uuid'] lockbox_secret = osd_block_lv.tags['ceph.cephx_lockbox_secret'] - self.with_tpm = bool(osd_block_lv.tags.get('ceph.with_tpm', 0)) + self.with_tpm = osd_block_lv.tags.get('ceph.with_tpm') == '1' if not self.with_tpm: encryption_utils.write_lockbox_keyring(osd_id, osd_fsid,