From: Sage Weil <sage@redhat.com>
Date: Sun, 1 Mar 2020 14:27:11 +0000 (-0600)
Subject: mgr/cephadm: orch ls: include specs with no daemons
X-Git-Tag: v15.1.1~191^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33553%2Fhead;p=ceph.git

mgr/cephadm: orch ls: include specs with no daemons

This way you see entries like

NAME           RUNNING  REFRESHED  IMAGE NAME                                      IMAGE ID        SPEC
mds.foo            0/1  -          <unknown>                                       <unknown>     present

before any daemons have been created.

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 4ab57b8be109..03379137179d 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1688,6 +1688,15 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
                     sm[n].container_image_id = 'mix'
                 if sm[n].container_image_name != dd.container_image_name:
                     sm[n].container_image_name = 'mix'
+        for n, spec in self.spec_store.specs.items():
+            if n in sm:
+                continue
+            sm[n] = orchestrator.ServiceDescription(
+                service_name=n,
+                spec_presence='present',
+                size=self._get_spec_size(spec),
+                running=0,
+            )
         return trivial_result([s for n, s in sm.items()])
 
     def list_daemons(self, daemon_type=None, daemon_id=None,