From: John Spray <john.spray@redhat.com>
Date: Mon, 13 Aug 2018 12:01:07 +0000 (+0100)
Subject: mgr/rook: update for v1beta1 API
X-Git-Tag: v14.0.1~202^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4a45b67a8c8b079a373e334f8bfd72cd97259853;p=ceph.git

mgr/rook: update for v1beta1 API

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/pybind/mgr/rook/rook_cluster.py b/src/pybind/mgr/rook/rook_cluster.py
index c4046fe579144..0ba46e7ba953c 100644
--- a/src/pybind/mgr/rook/rook_cluster.py
+++ b/src/pybind/mgr/rook/rook_cluster.py
@@ -19,7 +19,7 @@ except ImportError:
     ApiException = None
 
 ROOK_SYSTEM_NS = "rook-ceph-system"
-ROOK_API_VERSION = "v1alpha1"
+ROOK_API_VERSION = "v1beta1"
 ROOK_API_NAME = "ceph.rook.io/%s" % ROOK_API_VERSION
 
 log = logging.getLogger('rook')
@@ -196,8 +196,7 @@ class RookCluster(object):
                 "namespace": self.rook_namespace
             },
             "spec": {
-                "preservePoolsOnRemove": True,
-                "skipPoolCreation": True,
+                "onlyManageDaemons": True,
                 "metadataServer": {
                     "activeCount": spec.max_size,
                     "activeStandby": True