From f82eda64e7a27fbfa60a6be74cf228fb34371046 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Wed, 16 Jan 2019 10:49:56 -0500 Subject: [PATCH] mgr/orchestrator_cli: display service.service_instance for clustered services Signed-off-by: Jeff Layton --- src/pybind/mgr/orchestrator_cli/module.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/orchestrator_cli/module.py b/src/pybind/mgr/orchestrator_cli/module.py index 17aed3225972a..f887331008a92 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, -- 2.39.5