mgr/orch: collapse 'SPEC' and 'PLACEMENT' columns in 'orch ls'

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py
index 3cc5c86d1db45252c0641f660a67df855c7bd7c5..5b5d078ee07f02a8b7634b10af3ce8eb93a40b92 100644 (file)
--- 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],