From d3409d456233f7bc1c0ed23dbc2db29627d33d5c Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Tue, 21 Feb 2017 23:48:34 +0100 Subject: [PATCH] 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 --- src/ceph-disk/ceph_disk/main.py | 4 ++-- src/ceph-disk/tests/test_prepare.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py index d45bdb3dc63a1..84f1f5a3964cb 100755 --- 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 fccc7fa523868..6ab8ca49a4034 100644 --- 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): -- 2.39.5