]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
support dmcrypt partitions when activating 1961/head
authorAlfredo Deza <alfredo.deza@inktank.com>
Fri, 13 Jun 2014 13:37:33 +0000 (09:37 -0400)
committerAlfredo Deza <alfredo.deza@inktank.com>
Tue, 17 Jun 2014 13:06:07 +0000 (09:06 -0400)
Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
src/ceph-disk

index d47758ad8e53f488f2ea08bae4c0485598a6c165..d76cd2b36bf817e42efded7bb15882e65edb57d9 100755 (executable)
@@ -2091,8 +2091,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: