From 830755a3c366f58b6982261c297567e167a5f30b Mon Sep 17 00:00:00 2001
From: okozachenko <okozachenko1203@gmail.com>
Date: Tue, 16 Aug 2022 20:31:54 +1000
Subject: [PATCH] Fix volume list in cinder-volume deployment

Volumes (pod-shared and cinder-conversion) should be created
regardless of ceph backend existence but those are created
conditionally.
This bug has been existing but never revealed because conditional
check for ceph backend was wrong before. After this change
https://review.opendev.org/c/openstack/openstack-helm/+/852809,
started happening.

Change-Id: Ifc90e40bc201245d3d9e2b472573948ff64e0c61
---
 cinder/Chart.yaml                       | 2 +-
 cinder/templates/deployment-volume.yaml | 6 +++---
 releasenotes/notes/cinder.yaml          | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cinder/Chart.yaml b/cinder/Chart.yaml
index 1afe30f573..194f05c7d7 100644
--- a/cinder/Chart.yaml
+++ b/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:
diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml
index 5dfa8d7567..135672a0f7 100755
--- a/cinder/templates/deployment-volume.yaml
+++ b/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 }}
diff --git a/releasenotes/notes/cinder.yaml b/releasenotes/notes/cinder.yaml
index 97690c8432..93b00ff71b 100644
--- a/releasenotes/notes/cinder.yaml
+++ b/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
 ...