From 48ec0776e0eaf7277d8554975aea9e49b83ce231 Mon Sep 17 00:00:00 2001
From: Matt Pryor <matt@stackhpc.com>
Date: Wed, 30 Mar 2022 21:46:38 +0100
Subject: [PATCH] Add support for Cinder AZ + volume type

---
 charts/cluster-addons/templates/csi-cinder.yaml | 5 +++++
 charts/cluster-addons/values.yaml               | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/charts/cluster-addons/templates/csi-cinder.yaml b/charts/cluster-addons/templates/csi-cinder.yaml
index e134536..b724aaf 100644
--- a/charts/cluster-addons/templates/csi-cinder.yaml
+++ b/charts/cluster-addons/templates/csi-cinder.yaml
@@ -26,6 +26,11 @@ extraFiles:
         storageclass.kubernetes.io/is-default-class: "true"
       {{- end }}
     provisioner: cinder.csi.openstack.org
+    parameters:
+      availability: {{ .availabilityZone }}
+      {{- with .volumeType }}
+      type: {{ . }}
+      {{- end }}
     reclaimPolicy: {{ .reclaimPolicy }}
     allowVolumeExpansion: {{ .allowVolumeExpansion }}
     {{- with .allowedTopologies }}
diff --git a/charts/cluster-addons/values.yaml b/charts/cluster-addons/values.yaml
index 0b8343b..1a44339 100644
--- a/charts/cluster-addons/values.yaml
+++ b/charts/cluster-addons/values.yaml
@@ -187,8 +187,12 @@ openstack:
       reclaimPolicy: Delete
       # Indicates if volume expansion is allowed
       allowVolumeExpansion: true
+      # The Cinder availability zone to use for volumes provisioned by the storage class
+      availabilityZone: nova
+      # The Cinder volume type to use for volumes provisioned by the storage class
+      # If not given, the default volume type will be used
+      volumeType:
       # The allowed topologies for the storage class
-      # If not given, the default Cinder availability zone will be used
       allowedTopologies:
 
 # Settings for the metrics server