From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 16 Jan 2019 15:49:56 +0000 (-0500)
Subject: mgr/orchestrator_cli: display service.service_instance for clustered services
X-Git-Tag: v14.1.0~352^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f82eda64e7a27fbfa60a6be74cf228fb34371046;p=ceph.git

mgr/orchestrator_cli: display service.service_instance for clustered services

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---

diff --git a/src/pybind/mgr/orchestrator_cli/module.py b/src/pybind/mgr/orchestrator_cli/module.py
index 17aed3225972..f887331008a9 100644
--- a/src/pybind/mgr/orchestrator_cli/module.py
+++ b/src/pybind/mgr/orchestrator_cli/module.py
@@ -201,9 +201,14 @@ class OrchestratorCli(orchestrator.OrchestratorClientMixin, MgrModule):
         else:
             lines = []
             for s in services:
-                lines.append("{0}.{1} {2} {3} {4} {5}".format(
+                if s.service == None:
+                    service_id = s.service_instance
+                else:
+                    service_id = "{0}.{1}".format(s.service, s.service_instance)
+
+                lines.append("{0} {1} {2} {3} {4} {5}".format(
                     s.service_type,
-                    s.service_instance,
+                    service_id,
                     s.nodename,
                     s.container_id,
                     s.version,