From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Fri, 13 Jun 2014 13:37:33 +0000 (-0400)
Subject: support dmcrypt partitions when activating
X-Git-Tag: v0.80.6~66
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=80896dcf2c3ccba0b9b0b1bd9f6e075585e3d502;p=ceph.git

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 75ff4e2fe21..7c5e968da7c 100755
--- 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: