mgr/rook: Fix container id and image id in 'orch ps'

Fixes: https://tracker.ceph.com/issues/47513 Signed-off-by: Varsha Rao <varao@redhat.com>
ceph · Nov 16, 2020 · 1607bc5 · 1607bc5
1 parent 040fc79
commit 1607bc5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/pybind/mgr/rook/module.py b/src/pybind/mgr/rook/module.py
@@ -374,7 +374,7 @@ def _list_daemons(self, service_name=None, daemon_type=None, daemon_id=None, hos
         for p in pods:
             sd = orchestrator.DaemonDescription()
             sd.hostname = p['hostname']
-            sd.container_id = p['name']
+            sd.container_id = p['container_id'][0:12]
             sd.daemon_type = p['labels']['app'].replace('rook-ceph-', '')
             status = {
                 'Pending': -1,
@@ -397,6 +397,7 @@ def _list_daemons(self, service_name=None, daemon_type=None, daemon_id=None, hos
             if service_name is not None and service_name != sd.service_name():
                 continue
             sd.container_image_name = p['container_image_name']
+            sd.container_image_id = p['container_image_id']
             sd.created = p['created']
             sd.last_configured = p['created']
             sd.last_deployed = p['created']

diff --git a/src/pybind/mgr/rook/rook_cluster.py b/src/pybind/mgr/rook/rook_cluster.py
@@ -335,6 +335,8 @@ def predicate(item):
                 "labels": d['metadata']['labels'],
                 'phase': d['status']['phase'],
                 'container_image_name': image_name,
+                'container_image_id': d['status']['container_statuses'][0]['image_id'].split('@sha256:')[1],
+                'container_id': d['status']['container_statuses'][0]['container_id'].split('docker://')[1],
                 'refreshed': refreshed,
                 # these may get set below...
                 'started': None,