Merge "Disable cephfs provisioner in multinode jobs"

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:

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:

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

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:

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

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

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
+        - openstack-helm-infra-armada-update-passwords