From 619d334bdadd5976323655c63d1c60913a4f9a3d Mon Sep 17 00:00:00 2001
From: Matt Pryor <matt@stackhpc.com>
Date: Fri, 1 Apr 2022 09:24:48 +0100
Subject: [PATCH] Ignore volume AZ by default

---
 charts/cluster-addons/templates/cloud-config.yaml | 7 +++++--
 charts/cluster-addons/values.yaml                 | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/charts/cluster-addons/templates/cloud-config.yaml b/charts/cluster-addons/templates/cloud-config.yaml
index c52ce77..4dd285b 100644
--- a/charts/cluster-addons/templates/cloud-config.yaml
+++ b/charts/cluster-addons/templates/cloud-config.yaml
@@ -44,8 +44,11 @@ extraFiles:
         tls-insecure=true
         {{ "{{-" }} end {{ "}}" }}
         {{ "{{-" }} end {{ "}}" }}
-        {{- with .Values.openstack.cloudConfig }}
-        {{- nindent 8 . }}
+        {{- range $section, $items := omit .Values.openstack.cloudConfig "Global" }}
+        [{{ $section }}]
+        {{- range $name, $value := $items }}
+        {{ $name }}={{ $value }}
+        {{- end }}
         {{- end }}
 {{- end }}
 
diff --git a/charts/cluster-addons/values.yaml b/charts/cluster-addons/values.yaml
index 1a44339..1e3496d 100644
--- a/charts/cluster-addons/values.yaml
+++ b/charts/cluster-addons/values.yaml
@@ -140,6 +140,9 @@ openstack:
   # See https://github.com/kubernetes/cloud-provider-openstack/blob/master/docs/openstack-cloud-controller-manager/using-openstack-cloud-controller-manager.md#config-openstack-cloud-controller-manager
   # and https://github.com/kubernetes/cloud-provider-openstack/blob/master/docs/cinder-csi-plugin/using-cinder-csi-plugin.md#block-storage
   cloudConfig:
+    # By default, ignore volume AZs for Cinder as most clouds have a single globally-attachable Cinder AZ
+    BlockStorage:
+      ignore-volume-az: true
   # Settings for the Cloud Controller Manager (CCM)
   ccm:
     # Indicates if the OpenStack CCM should be enabled