From: Redouane Kachach Date: Mon, 27 Nov 2023 13:42:34 +0000 (+0100) Subject: mgr/rook: fixing devices listing on rook X-Git-Tag: v19.3.0~269^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c7f5e2fc74a618dfbdafe3622578d37b8e331ec1;p=ceph.git mgr/rook: fixing devices listing on rook Fixes: https://tracker.ceph.com/issues/63694 Signed-off-by: Redouane Kachach --- diff --git a/src/pybind/mgr/rook/rook_cluster.py b/src/pybind/mgr/rook/rook_cluster.py index 5c7c9fc0477..1a0caa263bf 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