]> git.apps.os.sepia.ceph.com Git - ceph.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)
committerSebastian Wagner <sebastian.wagner@suse.com>
Tue, 14 Jul 2020 09:39:06 +0000 (11:39 +0200)
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 343cf0386264e0c6c4851614b7251c18792e2d8b)

src/pybind/mgr/cephadm/module.py

index 4b247907ac83ceb1cc8073b555681509ad8b6312..b89c2408bb6f6ef9692dbd1486833bbc20cd9845 100644 (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: