From: Sage Weil <sage@redhat.com>
Date: Sat, 14 Mar 2020 13:32:50 +0000 (-0500)
Subject: mgr/cephadm: do not include 'osd' service in 'orch ls' output
X-Git-Tag: v15.2.0~45^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33968%2Fhead;p=ceph.git

mgr/cephadm: do not include 'osd' service in 'orch ls' output

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index f8a978947e1b..59ea74ba8fb9 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1746,6 +1746,8 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
                 n: str = dd.service_name()
                 if service_name and service_name != n:
                     continue
+                if dd.daemon_type == 'osd':
+                    continue                # ignore OSDs for now
                 spec = None
                 if dd.service_name() in self.spec_store.specs:
                     spec = self.spec_store.specs[dd.service_name()]