From: Guillaume Abrioux Date: Wed, 13 Nov 2024 15:23:36 +0000 (+0100) Subject: ceph-volume: fix dmcrypt activation regression X-Git-Tag: v20.0.0~662^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F60727%2Fhead;p=ceph.git 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 --- diff --git a/src/ceph-volume/ceph_volume/objectstore/lvmbluestore.py b/src/ceph-volume/ceph_volume/objectstore/lvmbluestore.py index ba3719cd3f3b7..aa11d5537230f 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,