From: Joshua Schmid <jschmid@suse.com>
Date: Thu, 21 Jan 2016 17:41:29 +0000 (+0100)
Subject: get rid of redundandacy in ceph_disk
X-Git-Tag: agogpemikxte-build-me~1^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=36ff111b67bcc5706f086ab2621dbf979b160576;p=ceph.git

get rid of redundandacy in ceph_disk
For a plain dmcrypt device, "create" is the same as open --type plain / plainOpen
bnc: #957385
---

diff --git a/src/ceph-disk b/src/ceph-disk
index 493f46d5069..0f15a6edb8f 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -1123,20 +1123,9 @@ def dmcrypt_new(rawdev, _uuid, cryptsetup_parameters, key_dir, luks):
         rawdev,
         ] + cryptsetup_parameters
 
-    create_args = [
-        'cryptsetup',
-        '--key-file',
-        '-',
-        'create',
-        _uuid,
-        rawdev,
-        ] + cryptsetup_parameters
-
     try:
         if luks:
             command_check_call_stdin(dmcrypt_retrieve_key(_uuid, key_dir, luks), luksFormat_args)
-        else:
-            command_check_call_stdin(dmcrypt_retrieve_key(_uuid, key_dir, luks), create_args)
     except subprocess.CalledProcessError as e:
         raise Error('unable to create dmcrypt device', rawdev, e)
 
@@ -1559,20 +1548,9 @@ def prepare_journal_dev(
                  journal_dmcrypt,
                    ] + cryptsetup_parameters
 
-            create_args = [
-                 'cryptsetup',
-                 '--key-file',
-                 journal_dm_keypath,
-                 'create',
-                 journal_uuid,
-                 journal_dmcrypt,
-                   ] + cryptsetup_parameters
-
             try:
                 if luks:
                     command_check_call(luksFormat_args)
-                else:
-                    command_check_call(create_args)
             except subprocess.CalledProcessError as e:
                 raise Error('unable to format device for LUKS', journal_symlink, e)