From d547063c37af33cd5c5791f93774d9f9553ed982 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <sw5822@att.com>
Date: Tue, 6 Aug 2019 08:42:51 -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: I36e68cc2e446afac8769fb9ab753105909341f24
Signed-off-by: Steve Wilkerson <sw5822@att.com>
---
 tools/deployment/armada/manifests/armada-ceph.yaml | 8 +++++++-
 tools/deployment/armada/manifests/armada-lma.yaml  | 3 +++
 tools/deployment/multinode/030-ceph.sh             | 7 ++++++-
 tools/deployment/multinode/035-ceph-ns-activate.sh | 3 +++
 tools/deployment/tenant-ceph/030-ceph.sh           | 6 +++++-
 tools/deployment/tenant-ceph/040-tenant-ceph.sh    | 4 +++-
 zuul.d/project.yaml                                | 2 +-
 7 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/tools/deployment/armada/manifests/armada-ceph.yaml b/tools/deployment/armada/manifests/armada-ceph.yaml
index dd771b748..7f02998c0 100644
--- a/tools/deployment/armada/manifests/armada-ceph.yaml
+++ b/tools/deployment/armada/manifests/armada-ceph.yaml
@@ -290,8 +290,14 @@ data:
     deployment:
       ceph: true
       rbd_provisioner: true
-      cephfs_provisioner: true
+      cephfs_provisioner: false
       client_secrets: false
+    storageclass:
+      cephfs:
+        provision_storage_class: false
+    manifests:
+      deployment_cephfs_provisioner: false
+      job_cephfs_client_key: false
     bootstrap:
       enabled: true
     conf:
diff --git a/tools/deployment/armada/manifests/armada-lma.yaml b/tools/deployment/armada/manifests/armada-lma.yaml
index 79aeddcc7..fe9e78a4d 100644
--- a/tools/deployment/armada/manifests/armada-lma.yaml
+++ b/tools/deployment/armada/manifests/armada-lma.yaml
@@ -94,6 +94,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 0f6144827..f37df3b6f 100755
--- a/tools/deployment/multinode/030-ceph.sh
+++ b/tools/deployment/multinode/030-ceph.sh
@@ -51,7 +51,7 @@ deployment:
   storage_secrets: true
   ceph: true
   rbd_provisioner: true
-  cephfs_provisioner: true
+  cephfs_provisioner: false
   client_secrets: false
   rgw_keystone_user_and_endpoints: false
 bootstrap:
@@ -89,8 +89,13 @@ jobs:
       # Skip new job if previous job still active
       execPolicy: Forbid
     startingDeadlineSecs: 60
+storageclass:
+  cephfs:
+    provision_storage_class: false
 manifests:
   cronjob_defragosds: true
+  deployment_cephfs_provisioner: false
+  job_cephfs_client_key: false
 EOF
 
 for CHART in ceph-mon ceph-osd ceph-client ceph-provisioners; do
diff --git a/tools/deployment/multinode/035-ceph-ns-activate.sh b/tools/deployment/multinode/035-ceph-ns-activate.sh
index 1a869334a..ea1f3cefe 100755
--- a/tools/deployment/multinode/035-ceph-ns-activate.sh
+++ b/tools/deployment/multinode/035-ceph-ns-activate.sh
@@ -33,6 +33,9 @@ deployment:
   cephfs_provisioner: false
   client_secrets: true
   rgw_keystone_user_and_endpoints: false
+storageclass:
+  cephfs:
+    provision_storage_class: false
 bootstrap:
   enabled: false
 conf:
diff --git a/tools/deployment/tenant-ceph/030-ceph.sh b/tools/deployment/tenant-ceph/030-ceph.sh
index 5dff8efe7..7a1836d2c 100755
--- a/tools/deployment/tenant-ceph/030-ceph.sh
+++ b/tools/deployment/tenant-ceph/030-ceph.sh
@@ -54,7 +54,7 @@ deployment:
   storage_secrets: true
   ceph: true
   rbd_provisioner: true
-  cephfs_provisioner: true
+  cephfs_provisioner: false
   client_secrets: false
   rgw_keystone_user_and_endpoints: false
 jobs:
@@ -73,6 +73,8 @@ jobs:
 manifests:
   deployment_mds: false
   cronjob_defragosds: true
+  deployment_cephfs_provisioner: false
+  job_cephfs_client_key: false
 bootstrap:
   enabled: true
 conf:
@@ -101,6 +103,8 @@ conf:
 storageclass:
   rbd:
     ceph_configmap_name: ceph-etc
+  cephfs:
+    provision_storage_class: false
 ceph_mgr_modules_config:
   prometheus:
     server_port: 9283
diff --git a/tools/deployment/tenant-ceph/040-tenant-ceph.sh b/tools/deployment/tenant-ceph/040-tenant-ceph.sh
index 5a95408a6..2529552f5 100755
--- a/tools/deployment/tenant-ceph/040-tenant-ceph.sh
+++ b/tools/deployment/tenant-ceph/040-tenant-ceph.sh
@@ -108,6 +108,8 @@ jobs:
 manifests:
   deployment_mds: false
   cronjob_defragosds: true
+  deployment_cephfs_provisioner: false
+  job_cephfs_client_key: false
 ceph_mgr_modules_config:
   prometheus:
     server_port: 9284
@@ -160,4 +162,4 @@ for CHART in ceph-mon ceph-osd ceph-client; do
 done
 
 helm test tenant-ceph-osd --timeout 900
-helm test ceph-client --timeout 900
+helm test tenant-ceph-client --timeout 900
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 8624f1402..978fac719 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -57,4 +57,4 @@
         - openstack-helm-infra-elastic-beats
         - openstack-helm-infra-armada-deploy
         - openstack-helm-infra-armada-update-uuid
-        - openstack-helm-infra-armada-update-passwords
\ No newline at end of file
+        - openstack-helm-infra-armada-update-passwords