From c7f5e2fc74a618dfbdafe3622578d37b8e331ec1 Mon Sep 17 00:00:00 2001 From: Redouane Kachach Date: Mon, 27 Nov 2023 14:42:34 +0100 Subject: [PATCH] mgr/rook: fixing devices listing on rook Fixes: https://tracker.ceph.com/issues/63694 Signed-off-by: Redouane Kachach --- src/pybind/mgr/rook/rook_cluster.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/rook/rook_cluster.py b/src/pybind/mgr/rook/rook_cluster.py index 5c7c9fc0477f9..1a0caa263bfbd 100644 --- a/src/pybind/mgr/rook/rook_cluster.py +++ b/src/pybind/mgr/rook/rook_cluster.py @@ -794,7 +794,12 @@ class RookCluster(object): else: fetcher = DefaultFetcher(sc.metadata.name, self.coreV1_api, self.rook_env) fetcher.fetch() - discovered_devices.update(fetcher.devices()) + nodename_to_devices = fetcher.devices() + for node, devices in nodename_to_devices.items(): + if node in discovered_devices: + discovered_devices[node].extend(devices) + else: + discovered_devices[node] = devices return discovered_devices -- 2.39.5