From fc3e6ea3d9200e0fe2a3aa2576fcd45db223c277 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Fri, 2 Nov 2018 15:03:45 -0400 Subject: [PATCH] ceph-volume util.encryption robust blkid+lsblk detection of lockbox Signed-off-by: Alfredo Deza --- src/ceph-volume/ceph_volume/util/encryption.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ceph-volume/ceph_volume/util/encryption.py b/src/ceph-volume/ceph_volume/util/encryption.py index 8bb7d47c490..90a4d1dada4 100644 --- a/src/ceph-volume/ceph_volume/util/encryption.py +++ b/src/ceph-volume/ceph_volume/util/encryption.py @@ -3,6 +3,7 @@ import os import logging from ceph_volume import process, conf from ceph_volume.util import constants, system +from ceph_volume.util.device import Device from .prepare import write_keyring from .disk import lsblk, device_family, get_part_entry_type @@ -251,9 +252,9 @@ def legacy_encrypted(device): return metadata parent_device = disk_meta['PKNAME'] # With the parent device set, we can now look for the lockbox listing associated devices - devices = device_family(parent_device) - for i in devices: - if 'lockbox' in i.get('PARTLABEL', ''): - metadata['lockbox'] = i['NAME'] + devices = [Device(i['NAME']) for i in device_family(parent_device)] + for d in devices: + if d.ceph_disk.type == 'lockbox': + metadata['lockbox'] = d.abspath break return metadata -- 2.39.5