From: Dan Mick Date: Wed, 29 Nov 2017 23:29:17 +0000 (-0800) Subject: ceph_disk: allow "no fsid" on activate X-Git-Tag: v13.0.1~47^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F18991%2Fhead;p=ceph.git 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 --- diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py index 798072ce8a79..3e8b62f9cab8 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()