mgr/rook: fixing devices listing on rook

Fixes: https://tracker.ceph.com/issues/63694
Signed-off-by: Redouane Kachach <rkachach@redhat.com>

diff --git a/src/pybind/mgr/rook/rook_cluster.py b/src/pybind/mgr/rook/rook_cluster.py
index 5c7c9fc0477f903824cabcfd8653aa20289d8cc5..1a0caa263bfbde4bcdf7fd20b90f7eac04507497 100644 (file)
--- 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