From: Kiefer Chang <kiefer.chang@suse.com>
Date: Tue, 10 Mar 2020 07:22:40 +0000 (+0800)
Subject: mgr/cephadm: fix service list filtering
X-Git-Tag: v15.1.1~48^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=281fc7d775fb82f73593d249c0d28424daba6ae9;p=ceph.git

mgr/cephadm: fix service list filtering

We should apply filters on ServiceSpecs in store too, or services are
returned even filters are applied during collecting daemons.

Fixes: https://tracker.ceph.com/issues/44512
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 8272bee58c31..9767c167b996 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1729,6 +1729,10 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
         for n, spec in self.spec_store.specs.items():
             if n in sm:
                 continue
+            if service_type is not None and service_type != spec.service_type:
+                continue
+            if service_name is not None and service_name != n:
+                continue
             sm[n] = orchestrator.ServiceDescription(
                 service_name=n,
                 spec=spec,