From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Mon, 1 Apr 2019 13:22:58 +0000 (+0200)
Subject: mgr/rook: Fix creation of bluestore OSDs:
X-Git-Tag: v14.2.1~41^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=85b68fc2d4ad6a4adc761cac94b13e4bc0c6f6ac;p=ceph.git

mgr/rook: Fix creation of bluestore OSDs:

See https://rook.io/docs/rook/v0.9/ceph-cluster-crd.html
    Storage Configuration: Specific devices

Fixes http://tracker.ceph.com/issues/39062

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 4dcfd71504cc3c1342179f17c42b176e973852e7)
---

diff --git a/src/pybind/mgr/rook/rook_cluster.py b/src/pybind/mgr/rook/rook_cluster.py
index d229c13e3666..9c3fee367354 100644
--- a/src/pybind/mgr/rook/rook_cluster.py
+++ b/src/pybind/mgr/rook/rook_cluster.py
@@ -377,7 +377,7 @@ class RookCluster(object):
         #       - name: "gravel1.rockery"
         #         devices:
         #          - name: "sdb"
-        #         storeConfig:
+        #         config:
         #           storeType: bluestore
 
         current_cluster = self.rook_api_get(
@@ -398,7 +398,7 @@ class RookCluster(object):
 
         if drive_group.hosts(all_hosts)[0] not in [n['name'] for n in current_nodes]:
             pd = { "name": drive_group.hosts(all_hosts)[0],
-                   "storeConfig": { "storeType": drive_group.objectstore }}
+                   "config": { "storeType": drive_group.objectstore }}
 
             if block_devices:
                 pd["devices"] = [{'name': d} for d in block_devices]