From: Sébastien Han <seb@redhat.com>
Date: Wed, 18 Jan 2017 13:03:44 +0000 (+0100)
Subject: ceph-disk: change get_dmcrypt_key test to support different cluster name
X-Git-Tag: v12.0.1~364^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1c747473600a9a7f528ad71a889c35d85ac115b1;p=ceph.git

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

Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py
index 13dc4922215..e5031ac8c30 100755
--- a/src/ceph-disk/ceph_disk/main.py
+++ b/src/ceph-disk/ceph_disk/main.py
@@ -2466,7 +2466,7 @@ class Lockbox(object):
                       self.args.lockbox)
             self.partition = self.create_partition()
 
-    def create_key(self, cluster):
+    def create_key(self):
         key_size = CryptHelpers.get_dmcrypt_keysize(self.args)
         key = open('/dev/urandom', 'rb').read(key_size / 8)
         base64_key = base64.b64encode(key)
@@ -2528,7 +2528,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.args.cluster)
+        self.create_key()
         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 2e475832d8d..1877b196575 100644
--- a/src/ceph-disk/tests/test_prepare.py
+++ b/src/ceph-disk/tests/test_prepare.py
@@ -316,7 +316,7 @@ class TestDevicePartitionCrypt(Base):
             partition.map()
             assert m['_dmcrypt_map'].called
             m['get_dmcrypt_key'].assert_called_with(
-                uuid, '/etc/ceph/dmcrypt-keys', True)
+                uuid, '/etc/ceph/dmcrypt-keys', True, 'ceph')
 
 
 class TestCryptHelpers(Base):