RepoMirrors
/
ceph
mirror of https://github.com/ceph/ceph
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #60727 from guits/dmcrypt-activate 

ceph-volume: fix dmcrypt activation regression
This commit is contained in:
Guillaume Abrioux 2024-11-14 14:02:16 +01:00 committed by GitHub
parent 4509ec2d14 3cf00cde82
commit f3f2267149
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ceph-volume/ceph_volume/objectstore/lvmbluestore.py
View File

@ -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,