From: Sage Weil <sage@newdream.net>
Date: Fri, 23 Apr 2021 18:53:54 +0000 (-0400)
Subject: mgr/orchestrator: include service_name in DaemonDescription dump
X-Git-Tag: v16.2.5~87^2~68
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4510f2849ada04c76a54bd1abe59d9e300b495e4;p=ceph.git

mgr/orchestrator: include service_name in DaemonDescription dump

('orch ps')

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 15e5c0a3accf8284d22df3b8f98b0127eec02834)
---

diff --git a/src/pybind/mgr/orchestrator/_interface.py b/src/pybind/mgr/orchestrator/_interface.py
index f805a685e72e..3c4c6c73b215 100644
--- a/src/pybind/mgr/orchestrator/_interface.py
+++ b/src/pybind/mgr/orchestrator/_interface.py
@@ -943,6 +943,7 @@ class DaemonDescription(object):
         out: Dict[str, Any] = OrderedDict()
         out['daemon_type'] = self.daemon_type
         out['daemon_id'] = self.daemon_id
+        out['service_name'] = self._service_name
         out['hostname'] = self.hostname
         out['container_id'] = self.container_id
         out['container_image_id'] = self.container_image_id