Merge "Fix volume list in cinder-volume deployment"

cinder/Chart.yaml

@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Cinder
 name: cinder
-version: 0.2.24
+version: 0.2.25
 home: https://docs.openstack.org/cinder/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cinder/OpenStack_Project_Cinder_vertical.png
 sources:

cinder/templates/deployment-volume.yaml

@@ -284,13 +284,13 @@ spec:
           secret:
             secretName: cinder-etc
             defaultMode: 0444
-        {{- if eq "true" (include "cinder.utils.has_ceph_backend" $envAll) }}
-        - name: etcceph
-          emptyDir: {}
         - name: pod-shared
           emptyDir: {}
         - name: cinder-conversion
           emptyDir: {}
+        {{- if eq "true" (include "cinder.utils.has_ceph_backend" $envAll) }}
+        - name: etcceph
+          emptyDir: {}
         - name: ceph-etc
           configMap:
             name: {{ .Values.ceph_client.configmap }}

releasenotes/notes/cinder.yaml

@@ -41,4 +41,5 @@ cinder:
   - 0.2.22 Add Xena and Yoga values overrides
   - 0.2.23 Added OCI registry authentication
   - 0.2.24 Fix conditional check for cinder.utils.has_ceph_backend template
+  - 0.2.25 Remove volumes unrelated with ceph backend from conditional volume list in cinder-volume deployment
 ...