From: Felix Winterhalter <felix@audiofair.de>
Date: Mon, 17 Jul 2017 00:04:39 +0000 (+0200)
Subject: ceph-disk activate unlocks bluestore data partition
X-Git-Tag: v12.2.2~59^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3e9aad1a116e02bb126010f310ca2267177b5162;p=ceph.git

ceph-disk activate unlocks bluestore data partition

Signed-off-by: Felix Winterhalter <felix@audiofair.de>
(cherry picked from commit 1287caf2dbb5ef6e5f243fe1d23633946aef26f9)
---

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 0ad3f1afd1c..28b0a118926
--- a/src/ceph-disk/ceph_disk/main.py
+++ b/src/ceph-disk/ceph_disk/main.py
@@ -3751,6 +3751,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,