From cdff256afe1b006c8480878a031807795f032576 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 6 Mar 2020 17:20:51 -0600 Subject: [PATCH] mgr/orch: collapse 'SPEC' and 'PLACEMENT' columns in 'orch ls' Signed-off-by: Sage Weil --- src/pybind/mgr/orchestrator/module.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py index 3cc5c86d1db45..5b5d078ee07f0 100644 --- a/src/pybind/mgr/orchestrator/module.py +++ b/src/pybind/mgr/orchestrator/module.py @@ -341,7 +341,7 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule): now = datetime.datetime.utcnow() table = PrettyTable( ['NAME', 'RUNNING', 'REFRESHED', 'AGE', - 'SPEC', 'PLACEMENT', + 'SPEC', 'IMAGE NAME', 'IMAGE ID', ], border=False) @@ -352,7 +352,6 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule): table.align['IMAGE NAME'] = 'l' table.align['IMAGE ID'] = 'l' table.align['SPEC'] = 'l' - table.align['PLACEMENT'] = 'l' table.left_padding_width = 0 table.right_padding_width = 2 for s in sorted(services, key=lambda s: s.service_name): @@ -361,7 +360,6 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule): '%d/%d' % (s.running, s.size), nice_delta(now, s.last_refresh, ' age'), nice_delta(now, s.created), - 'present' if s.spec else '-', s.spec.placement.pretty_str() if s.spec else '-', ukn(s.container_image_name), ukn(s.container_image_id)[0:12], -- 2.47.3