]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr/cephadm: get_daemons_by_service should use dd.service_name
authorSebastian Wagner <sebastian.wagner@suse.com>
Fri, 31 Jul 2020 09:06:35 +0000 (11:06 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Fri, 31 Jul 2020 09:06:35 +0000 (11:06 +0200)
daemon_name does not necessarily starts with the service_name.

Especially not for OSDs.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
src/pybind/mgr/cephadm/inventory.py

index 613b6066952b43675fd4196823252bc275915ad1..7c6b1e77c95f783137b764a41aeb87eca318bb75 100644 (file)
@@ -375,7 +375,7 @@ class HostCache():
         result = []   # type: List[orchestrator.DaemonDescription]
         for host, dm in self.daemons.items():
             for name, d in dm.items():
-                if name.startswith(service_name + '.'):
+                if d.service_name() == service_name:
                     result.append(d)
         return result