ceph-disk: split get_dmcrypt_key_path from key creation

In preparation for mapping dmcrypt cyphertext devs during activation.

Signed-off-by: David Disseldorp <ddiss@suse.de>

diff --git a/src/ceph-disk b/src/ceph-disk
index 36cb2b7b4a57ab10cca1a091f9293bcba01a9702..46f4e058aeb410595f1128537c148ea06d6408d2 100755 (executable)
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -796,23 +796,36 @@ def get_fsid(cluster):
     return fsid.lower()
 
 
-def get_or_create_dmcrypt_key(
+def get_dmcrypt_key_path(
     _uuid,
     key_dir,
-    key_size,
     luks
     ):
     """
-    Get path to dmcrypt key or create a new key file.
+    Get path to dmcrypt key file.
 
-    :return: Path to the dmcrypt key file.
+    :return: Path to the dmcrypt key file, callers should check for existence.
     """
     if luks:
         path = os.path.join(key_dir, _uuid + ".luks.key")
     else:
         path = os.path.join(key_dir, _uuid)
 
-    # already have it?
+    return path
+
+
+def get_or_create_dmcrypt_key(
+    _uuid,
+    key_dir,
+    key_size,
+    luks
+    ):
+    """
+    Get path to existing dmcrypt key or create a new key file.
+
+    :return: Path to the dmcrypt key file.
+    """
+    path = get_dmcrypt_key_path(_uuid, key_dir, luks)
     if os.path.exists(path):
         return path