mgr/cephadm: get_daemons_by_service should use dd.service_name

daemon_name does not necessarily starts with the service_name.

Especially not for OSDs.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 051361e22246120331795b70513beaaff29ceb51)

diff --git a/src/pybind/mgr/cephadm/inventory.py b/src/pybind/mgr/cephadm/inventory.py
index b955078e88b49af228bc5cd346192befa3244daa..46e353043cd749aed2e6eff3d868c89234b2a56c 100644 (file)
--- a/src/pybind/mgr/cephadm/inventory.py
+++ b/src/pybind/mgr/cephadm/inventory.py
@@ -377,7 +377,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