From 955edfdb28393712f7d80f1f7702150a4b800e30 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <sw5822@att.com>
Date: Wed, 14 Aug 2019 10:13:48 -0500
Subject: [PATCH] Disable cephfs provisioner in multinode jobs

This disables the cephfs provisioner in the multinode
periodic jobs. It seems the helm tests for the ceph
provisioner chart that test cephfs fail more often than
not in the multinode jobs while passing reliably in the
single node check and gate jobs. As cephfs is still
gated, disabling the cephfs provisioner in the periodic
jobs allows for further investigation into this issue
without causing potential regressions

Change-Id: Id4cf7d6571855413be4b67a440423445af3270e3
Signed-off-by: Steve Wilkerson <sw5822@att.com>
---
 tools/deployment/armada/manifests/armada-osh.yaml  | 3 +++
 tools/deployment/multinode/030-ceph.sh             | 9 +++++++--
 tools/deployment/multinode/040-ceph-ns-activate.sh | 3 +++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/tools/deployment/armada/manifests/armada-osh.yaml b/tools/deployment/armada/manifests/armada-osh.yaml
index e6509676c6..ebb6f1ab47 100644
--- a/tools/deployment/armada/manifests/armada-osh.yaml
+++ b/tools/deployment/armada/manifests/armada-osh.yaml
@@ -101,6 +101,9 @@ data:
       rbd_provisioner: false
       cephfs_provisioner: false
       client_secrets: true
+    storageclass:
+      cephfs:
+        provision_storage_class: False
     bootstrap:
       enabled: false
   source:
diff --git a/tools/deployment/multinode/030-ceph.sh b/tools/deployment/multinode/030-ceph.sh
index 24bb17202d..cbf09c10fc 100755
--- a/tools/deployment/multinode/030-ceph.sh
+++ b/tools/deployment/multinode/030-ceph.sh
@@ -41,7 +41,7 @@ deployment:
   storage_secrets: true
   ceph: true
   rbd_provisioner: true
-  cephfs_provisioner: true
+  cephfs_provisioner: false
   client_secrets: false
 bootstrap:
   enabled: true
@@ -63,7 +63,12 @@ conf:
         journal:
           type: directory
           location: /var/lib/openstack-helm/ceph/osd/journal-one
-
+storageclass:
+  cephfs:
+    provision_storage_class: false
+manifests:
+  deployment_cephfs_provisioner: false
+  job_cephfs_client_key: false
 EOF
 
 : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
diff --git a/tools/deployment/multinode/040-ceph-ns-activate.sh b/tools/deployment/multinode/040-ceph-ns-activate.sh
index d19cca7809..ad98b400bf 100755
--- a/tools/deployment/multinode/040-ceph-ns-activate.sh
+++ b/tools/deployment/multinode/040-ceph-ns-activate.sh
@@ -33,6 +33,9 @@ deployment:
   client_secrets: true
 bootstrap:
   enabled: false
+storageclass:
+  cephfs:
+    provision_storage_class: false
 EOF
 
 : ${OSH_INFRA_PATH:="../openstack-helm-infra"}