Revert "ceph-disk: change get_dmcrypt_key test to support different cluster name"

Merged by mistake, teuthology ceph-disk fails

This reverts commit 1c747473600a9a7f528ad71a889c35d85ac115b1.

Signed-off-by: Loic Dachary <ldachary@redhat.com>

diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py
index d45bdb3dc63a16a75ee9a7ca155c69ad6c0b8874..84f1f5a3964cb74f85f7f3924c7c99f9d811f8a9 100755 (executable)
--- a/src/ceph-disk/ceph_disk/main.py
+++ b/src/ceph-disk/ceph_disk/main.py
@@ -2483,7 +2483,7 @@ class Lockbox(object):
                       self.args.lockbox)
             self.partition = self.create_partition()
 
-    def create_key(self):
+    def create_key(self, cluster):
         key_size = CryptHelpers.get_dmcrypt_keysize(self.args)
         key = open('/dev/urandom', 'rb').read(key_size / 8)
         base64_key = base64.b64encode(key)
@@ -2541,7 +2541,7 @@ class Lockbox(object):
         LOG.debug('Mounting lockbox ' + str(" ".join(args)))
         command_check_call(args)
         write_one_line(path, 'osd-uuid', self.args.osd_uuid)
-        self.create_key()
+        self.create_key(self.args.cluster)
         self.symlink_spaces(path)
         write_one_line(path, 'magic', CEPH_LOCKBOX_ONDISK_MAGIC)
         if self.device is not None:

diff --git a/src/ceph-disk/tests/test_prepare.py b/src/ceph-disk/tests/test_prepare.py
index fccc7fa523868e77e0fff864f5fbe1e304148a3b..6ab8ca49a4034fd00a008983119c1754b7fb8a13 100644 (file)
--- a/src/ceph-disk/tests/test_prepare.py
+++ b/src/ceph-disk/tests/test_prepare.py
@@ -319,7 +319,7 @@ class TestDevicePartitionCrypt(Base):
             partition.map()
             assert m['_dmcrypt_map'].called
             m['get_dmcrypt_key'].assert_called_with(
-                uuid, '/etc/ceph/dmcrypt-keys', True, 'ceph')
+                uuid, '/etc/ceph/dmcrypt-keys', True)
 
 
 class TestCryptHelpers(Base):