From 17e08ec3e27f488f9f66a6dc7a8d18626904ecdd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Juan=20Miguel=20Olmo=20Mart=C3=ADnez?= Date: Fri, 7 Feb 2020 18:32:25 +0100 Subject: [PATCH] mgr/rook: Fix error creating OSD's MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes: https://tracker.ceph.com/issues/43972 Signed-off-by: Juan Miguel Olmo Martínez --- src/pybind/mgr/rook/rook_cluster.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/pybind/mgr/rook/rook_cluster.py b/src/pybind/mgr/rook/rook_cluster.py index 78475d23b31e..ba6e04f6e520 100644 --- a/src/pybind/mgr/rook/rook_cluster.py +++ b/src/pybind/mgr/rook/rook_cluster.py @@ -528,7 +528,7 @@ class RookCluster(object): "config": { "storeType": drive_group.objectstore }} if block_devices: - pd["devices"] = [{'name': d} for d in block_devices] + pd["devices"] = [{'name': d.path} for d in block_devices] if directories: pd["directories"] = [{'path': p} for p in directories] @@ -551,16 +551,16 @@ class RookCluster(object): patch.append({ "op": "add", "path": "/spec/storage/nodes/{0}/devices/-".format(node_idx), - "value": {'name': n} # type: ignore - }) - - new_dirs = list(set(directories) - set(current_node['directories'])) - for p in new_dirs: - patch.append({ - "op": "add", - "path": "/spec/storage/nodes/{0}/directories/-".format(node_idx), - "value": {'path': p} # type: ignore + "value": {'name': n.path} # type: ignore }) + if directories: + new_dirs = list(set(directories) - set(current_node['directories'])) + for p in new_dirs: + patch.append({ + "op": "add", + "path": "/spec/storage/nodes/{0}/directories/-".format(node_idx), + "value": {'path': p} # type: ignore + }) if len(patch) == 0: return "No change" -- 2.47.3