]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/orchestrator: remove IMAGE ID from 'orch ls'
authorSage Weil <sage@newdream.net>
Fri, 9 Apr 2021 19:35:17 +0000 (15:35 -0400)
committerSage Weil <sage@newdream.net>
Fri, 9 Apr 2021 19:35:17 +0000 (15:35 -0400)
This is not very useful at this level:
 - we see it from 'orch ps'
 - it can be a mix of ids during upgrade
 - some services may have multiple images at steady state (e.g., ingress)

Signed-off-by: Sage Weil <sage@newdream.net>
src/pybind/mgr/orchestrator/module.py

index 2e9e1f2574a3face02bc377bbbed99b3e7cd178c..f24177064e401d36e896c6a1d65b3e1fd06169a1 100644 (file)
@@ -562,14 +562,13 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule,
             now = datetime_now()
             table = PrettyTable(
                 ['NAME', 'RUNNING', 'REFRESHED', 'AGE',
-                 'PLACEMENT', 'IMAGE ID'
+                 'PLACEMENT',
                  ],
                 border=False)
             table.align['NAME'] = 'l'
             table.align['RUNNING'] = 'r'
             table.align['REFRESHED'] = 'l'
             table.align['AGE'] = 'l'
-            table.align['IMAGE ID'] = 'l'
             table.align['PLACEMENT'] = 'l'
             table.left_padding_width = 0
             table.right_padding_width = 2
@@ -591,7 +590,6 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule,
                     refreshed,
                     nice_delta(now, s.created),
                     pl,
-                    ukn(s.container_image_id)[0:12],
                 ))
 
             return HandleCommandResult(stdout=table.get_string())