support dmcrypt partitions when activating

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
(cherry picked from commit ef8a1281512c4ee70a3764b28891da691a183804)

diff --git a/src/ceph-disk b/src/ceph-disk
index 75ff4e2fe21cc71c99dc542f6d00049d2bb2ebd8..7c5e968da7cf81a368f08d100c44bbd91d174fba 100755 (executable)
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -2024,8 +2024,14 @@ def main_activate_all(args):
         if name.find('.') < 0:
             continue
         (tag, uuid) = name.split('.')
-        if tag == OSD_UUID:
-            path = os.path.join(dir, name)
+
+        if tag == OSD_UUID or tag == DMCRYPT_OSD_UUID:
+
+            if tag == DMCRYPT_OSD_UUID:
+                path = os.path.join('/dev/mapper', uuid)
+            else:
+                path = os.path.join(dir, name)
+
             LOG.info('Activating %s', path)
             activate_lock.acquire()
             try: