RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 19:47:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/orchestrator: remove image name field from 'orch ps' and 'orch ls'

Browse Source 
Now that we're typically using the image digests the name isn't as helpful. We also
end up in scenarios where some images use tags for their name and others use the
digest so the image name comes out as "mix" in orch ls despite it being the same image.

Fixes: https://tracker.ceph.com/issues/47333

Signed-off-by: Adam King <adking@redhat.com>
This commit is contained in:
Adam King 2021-03-18 13:20:46 -04:00
parent b5a8e96b96
commit 30c9210d97
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pybind/mgr/orchestrator/module.py
View File

@ -557,15 +557,13 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule,
now = datetime_now()
table = PrettyTable(
['NAME', 'RUNNING', 'REFRESHED', 'AGE',
'PLACEMENT',
'IMAGE NAME', 'IMAGE ID'
'PLACEMENT', 'IMAGE ID'
],
border=False)
table.align['NAME'] = 'l'
table.align['RUNNING'] = 'r'
table.align['REFRESHED'] = 'l'
table.align['AGE'] = 'l'
table.align['IMAGE NAME'] = 'l'
table.align['IMAGE ID'] = 'l'
table.align['PLACEMENT'] = 'l'
table.left_padding_width = 0
@ -588,7 +586,6 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule,
refreshed,
nice_delta(now, s.created),
pl,
ukn(s.container_image_name),
ukn(s.container_image_id)[0:12],
))
@ -627,7 +624,7 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule,
now = datetime_now()
table = PrettyTable(
['NAME', 'HOST', 'STATUS', 'REFRESHED', 'AGE', 'PORTS',
'VERSION', 'IMAGE NAME', 'IMAGE ID', 'CONTAINER ID'],
'VERSION', 'IMAGE ID', 'CONTAINER ID'],
border=False)
table.align = 'l'
table.left_padding_width = 0
@ -653,7 +650,6 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule,
nice_delta(now, s.created),
s.get_port_summary() or '-',
ukn(s.version),
ukn(s.container_image_name),
ukn(s.container_image_id)[0:12],
ukn(s.container_id)))