Merge pull request from jschmid1/osd_servicedescription_fix

mgr/cephadm: exclude osds without osdspec_affinity

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
This commit is contained in:
Sebastian Wagner 2020-06-24 15:08:19 +02:00 committed by GitHub
commit eabfd2e1e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1279,6 +1279,9 @@ you may want to run:
OSDs do not know the affinity to their spec out of the box.
"""
n = f"osd.{dd.osdspec_affinity}"
if not dd.osdspec_affinity:
# If there is no osdspec_affinity, the spec should suffice for displaying
continue
if n in self.spec_store.specs:
spec = self.spec_store.specs[n]
else: