From f965bdd0134cbc3d947ac83bf96e5ce08541a198 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Thu, 3 Aug 2017 10:56:24 +0200 Subject: [PATCH] ceph-disk: dmcrypt cluster must default to ceph If ceph_fsid is not found, which is the case for legacy dmcrypted OSD, the cluster must default to ceph, as it was before support for non standard cluster names was introduced. Fixes: http://tracker.ceph.com/issues/20893 Signed-off-by: Loic Dachary (cherry picked from commit ed22159fdd7071a110e81cd7b63d7e0f2296761b) --- src/ceph-disk/ceph_disk/main.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py index cabd7fff9895..86146399631f 100755 --- a/src/ceph-disk/ceph_disk/main.py +++ b/src/ceph-disk/ceph_disk/main.py @@ -1152,11 +1152,14 @@ def get_dmcrypt_key( osd_uuid = get_oneliner(path, 'osd-uuid') ceph_fsid = read_one_line(path, 'ceph_fsid') if ceph_fsid is None: - raise Error('No cluster uuid assigned.') - cluster = find_cluster_by_uuid(ceph_fsid) - if cluster is None: - raise Error('No cluster conf found in ' + SYSCONFDIR + - ' with fsid %s' % ceph_fsid) + LOG.warning("no `ceph_fsid` found falling back to 'ceph' " + "for cluster name") + cluster = 'ceph' + else: + cluster = find_cluster_by_uuid(ceph_fsid) + if cluster is None: + raise Error('No cluster conf found in ' + SYSCONFDIR + + ' with fsid %s' % ceph_fsid) if mode == KEY_MANAGEMENT_MODE_V1: key, stderr, ret = command( -- 2.47.3