mgr/rook: Install ceph-csi-operator CRDs before cluster create

Signed-off-by: David Galloway <david.galloway@ibm.com>

diff --git a/src/pybind/mgr/rook/ci/scripts/bootstrap-rook-cluster.sh b/src/pybind/mgr/rook/ci/scripts/bootstrap-rook-cluster.sh
index ef19dfc946f6e3002e443025eef28a91b32ab1ef..f46b227c8f7faab8fdb168a78a56bd40537b69a9 100755 (executable)
--- a/src/pybind/mgr/rook/ci/scripts/bootstrap-rook-cluster.sh
+++ b/src/pybind/mgr/rook/ci/scripts/bootstrap-rook-cluster.sh
@@ -71,11 +71,13 @@ build_ceph_image() {
 }
 
 create_rook_cluster() {
-    $KUBECTL create -f https://raw.githubusercontent.com/rook/rook/master/deploy/examples/crds.yaml
-    $KUBECTL create -f https://raw.githubusercontent.com/rook/rook/master/deploy/examples/common.yaml
-    $KUBECTL create -f https://raw.githubusercontent.com/rook/rook/master/deploy/examples/operator.yaml
+    local base="https://raw.githubusercontent.com/rook/rook/master/deploy/examples"
+    $KUBECTL create -f ${base}/crds.yaml
+    $KUBECTL create -f ${base}/common.yaml
+    $KUBECTL create -f ${base}/csi-operator.yaml
+    $KUBECTL create -f ${base}/operator.yaml
     $KUBECTL create -f $CLUSTER_SPEC
-    $KUBECTL create -f https://raw.githubusercontent.com/rook/rook/master/deploy/examples/toolbox.yaml
+    $KUBECTL create -f ${base}/toolbox.yaml
 }
 
 is_operator_ready() {