From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Fri, 31 Jul 2020 09:06:35 +0000 (+0200)
Subject: mgr/cephadm: get_daemons_by_service should use dd.service_name
X-Git-Tag: v16.1.0~1520^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=051361e22246120331795b70513beaaff29ceb51;p=ceph.git

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>
---

diff --git a/src/pybind/mgr/cephadm/inventory.py b/src/pybind/mgr/cephadm/inventory.py
index 613b6066952b..7c6b1e77c95f 100644
--- a/src/pybind/mgr/cephadm/inventory.py
+++ b/src/pybind/mgr/cephadm/inventory.py
@@ -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