mgr/rook: include container_image_name in 'orch ps'

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

diff --git a/src/pybind/mgr/rook/module.py b/src/pybind/mgr/rook/module.py
index 93e9ef4dc7dfdc6f02c66e38f8e1bb4ce4c06ae0..2bfb0ed5f500d19eddaaef1e628448c849fd110a 100644 (file)
--- a/src/pybind/mgr/rook/module.py
+++ b/src/pybind/mgr/rook/module.py
@@ -286,6 +286,7 @@ class RookOrchestrator(MgrModule, orchestrator.Orchestrator):
                 # Unknown type -- skip it
                 continue
 
+            sd.container_image_name = p['container_image_name']
             result.append(sd)
 
         return result

diff --git a/src/pybind/mgr/rook/rook_cluster.py b/src/pybind/mgr/rook/rook_cluster.py
index 6a8de2a9b312affe9d2811fb3635dd3c02a85875..4d6828b3f300b9e6a8dfccadd810a034a21a3779 100644 (file)
--- a/src/pybind/mgr/rook/rook_cluster.py
+++ b/src/pybind/mgr/rook/rook_cluster.py
@@ -320,11 +320,19 @@ class RookCluster(object):
         for p in pods:
             d = p.to_dict()
             # p['metadata']['creationTimestamp']
+
+            image_name = None
+            for c in d['spec']['containers']:
+                # look at the first listed container in the pod...
+                image_name = c['image']
+                break
+
             pods_summary.append({
                 "name": d['metadata']['name'],
                 "hostname": d['spec']['node_name'],
                 "labels": d['metadata']['labels'],
-                'phase': d['status']['phase']
+                'phase': d['status']['phase'],
+                'container_image_name': image_name,
             })
 
         return pods_summary