From: Joshua Schmid Date: Tue, 16 Jun 2020 09:53:25 +0000 (+0200) Subject: mgr/cephadm: exclude osds without osdspec_affinity X-Git-Tag: wip-pdonnell-testing-20200918.022351~888^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=343cf0386264e0c6c4851614b7251c18792e2d8b;p=ceph-ci.git mgr/cephadm: exclude osds without osdspec_affinity Signed-off-by: Joshua Schmid --- diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index 2a217c22711..ecc678f155a 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -1274,6 +1274,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: