Skip to content

Commit 3cf00cd

Browse files
committed
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 <[email protected]>
1 parent ce0d6fc commit 3cf00cd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/ceph-volume/ceph_volume/objectstore/lvmbluestore.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ def _activate(self,
367367
if is_encrypted:
368368
osd_lv_path = '/dev/mapper/%s' % osd_block_lv.__dict__['lv_uuid']
369369
lockbox_secret = osd_block_lv.tags['ceph.cephx_lockbox_secret']
370-
self.with_tpm = bool(osd_block_lv.tags.get('ceph.with_tpm', 0))
370+
self.with_tpm = osd_block_lv.tags.get('ceph.with_tpm') == '1'
371371
if not self.with_tpm:
372372
encryption_utils.write_lockbox_keyring(osd_id,
373373
osd_fsid,

0 commit comments

Comments
 (0)