mgr/cephadm: fix --service-type flag in orch ls when service has id

The running daemon count comes out wrong if the service type is
for a service that has an id.

Fixes: https://tracker.ceph.com/issues/50981
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 29ad6b45f313e3c201c6e11d4087e1581b30b617)

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index cde603154deb3185e1a1c014062d6f7f4e118f95..39a470c9dbae8dba7d801b5f126b9baf2b69c132 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1747,8 +1747,7 @@ Then run the following:
 
                 if (
                     service_type
-                    and service_type != n
-                    and not dd.daemon_type.startswith(n + '.')
+                    and service_type != daemon_type_to_service(dd.daemon_type)
                 ):
                     continue
                 if service_name and service_name != n: