From bca7a7529f9e0fb182864655829aaacc79275bc8 Mon Sep 17 00:00:00 2001 From: Varsha Rao Date: Tue, 17 Nov 2020 14:41:57 +0530 Subject: [PATCH] mgr/rook: Fix image id, age & image name in `orch ls` Signed-off-by: Varsha Rao --- src/pybind/mgr/rook/module.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/rook/module.py b/src/pybind/mgr/rook/module.py index e5c24dabf5880..f1258bf7c11cc 100644 --- a/src/pybind/mgr/rook/module.py +++ b/src/pybind/mgr/rook/module.py @@ -374,14 +374,23 @@ class RookOrchestrator(MgrModule, orchestrator.Orchestrator): placement=PlacementSpec(count=active), ), size=active, - container_image_name=image_name, last_refresh=now, ) for dd in self._list_daemons(): if dd.service_name() not in spec: continue - spec[dd.service_name()].running += 1 + service = spec[dd.service_name()] + service.running += 1 + if not service.container_image_id: + service.container_image_id = dd.container_image_id + if not service.container_image_name: + service.container_image_name = dd.container_image_name + if not service.last_refresh or not dd.last_refresh or dd.last_refresh < service.last_refresh: + service.last_refresh = dd.last_refresh + if not service.created or dd.created < service.created: + service.created = dd.created + return [v for k, v in spec.items()] @deferred_read -- 2.39.5