From 4d010fb83d3cad50953cdf010d1bb20c62588b3c Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Wed, 29 Nov 2017 15:29:17 -0800 Subject: [PATCH] ceph_disk: allow "no fsid" on activate The intent was to allow "no fsid" configurations when only one conf file named 'ceph.conf' was present, but the code has a bug in that ceph-osd --show-config-value will return a default all-0 uuid. Treat 'all-0' as we were treating 'None'. Signed-off-by: Dan Mick --- src/ceph-disk/ceph_disk/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py index 798072ce8a79d..3e8b62f9cab8f 100644 --- a/src/ceph-disk/ceph_disk/main.py +++ b/src/ceph-disk/ceph_disk/main.py @@ -1258,7 +1258,8 @@ def get_fsid(cluster): :return: The fsid or raises Error. """ fsid = get_conf_with_default(cluster=cluster, variable='fsid') - if fsid is None: + # uuids from boost always default to 'the empty uuid' + if fsid == '00000000-0000-0000-0000-000000000000': raise Error('getting cluster uuid from configuration failed') return fsid.lower() -- 2.39.5