]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr/cephadm: exclude osds without osdspec_affinity
authorJoshua Schmid <jschmid@suse.de>
Tue, 16 Jun 2020 09:53:25 +0000 (11:53 +0200)
committerJoshua Schmid <jschmid@suse.de>
Tue, 16 Jun 2020 09:55:50 +0000 (11:55 +0200)
Signed-off-by: Joshua Schmid <jschmid@suse.de>
src/pybind/mgr/cephadm/module.py

index 2a217c22711f16549ed3fc9539f1fde42903a003..ecc678f155ae9b85b367ac6687de2fd46b8fac11 100644 (file)
@@ -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: