From 1287caf2dbb5ef6e5f243fe1d23633946aef26f9 Mon Sep 17 00:00:00 2001 From: Felix Winterhalter Date: Mon, 17 Jul 2017 02:04:39 +0200 Subject: [PATCH] ceph-disk activate unlocks bluestore data partition Signed-off-by: Felix Winterhalter --- src/ceph-disk/ceph_disk/main.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) mode change 100755 => 100644 src/ceph-disk/ceph_disk/main.py diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py old mode 100755 new mode 100644 index ddc6bcfa23d98..0e4aaaa23f691 --- a/src/ceph-disk/ceph_disk/main.py +++ b/src/ceph-disk/ceph_disk/main.py @@ -3756,6 +3756,25 @@ def main_activate(args): ) osd_data = get_mount_point(cluster, osd_id) + args.cluster = cluster + + # Check if encrypted block device in journal + + block_dmcrypt_path = os.path.join(osd_data, 'block_dmcrypt') + + if args.dmcrypt and os.path.exists(block_dmcrypt_path): + partition = DevicePartition.factory( + path=None, + dev=os.path.join(osd_data, 'block_dmcrypt'), + args=args) + + partition.osd_dm_key = get_dmcrypt_key( + get_partition_uuid(args.path), + args.dmcrypt_key_dir, + CryptHelpers.get_dmcrypt_type(args) == "luks") + + partition.map() + elif stat.S_ISDIR(mode): (cluster, osd_id) = activate_dir( path=args.path, -- 2.47.3