From: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Date: Fri, 7 Feb 2020 17:32:25 +0000 (+0100)
Subject: mgr/rook: Fix error creating OSD's
X-Git-Tag: v15.1.1~468^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33176%2Fhead;p=ceph.git

mgr/rook: Fix error creating OSD's

Fixes: https://tracker.ceph.com/issues/43972

Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
---

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"