ceph-volume: make raw prepare use encryption_units.prepare_dmcrypt

Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>
(cherry picked from commit 2c3477a69e2e01e999ff23ecf4a6508c87c340de)

diff --git a/src/ceph-volume/ceph_volume/devices/raw/prepare.py b/src/ceph-volume/ceph_volume/devices/raw/prepare.py
index 3c96eedacf34a6d6f30d7ce09eceeb595016092f..2179db2331a4ea5b88d8ce1c0792a610a4abfa35 100644 (file)
--- a/src/ceph-volume/ceph_volume/devices/raw/prepare.py
+++ b/src/ceph-volume/ceph_volume/devices/raw/prepare.py
@@ -22,18 +22,7 @@ def prepare_dmcrypt(key, device, device_type, fsid):
         return ''
     kname = disk.lsblk(device)['KNAME']
     mapping = 'ceph-{}-{}-{}-dmcrypt'.format(fsid, kname, device_type)
-    # format data device
-    encryption_utils.luks_format(
-        key,
-        device
-    )
-    encryption_utils.luks_open(
-        key,
-        device,
-        mapping
-    )
-
-    return '/dev/mapper/{}'.format(mapping)
+    return encryption_utils.prepare_dmcrypt(key, device, mapping)
 
 def prepare_bluestore(block, wal, db, secrets, osd_id, fsid, tmpfs):
     """