openstack/magnum-capi-helm-charts
Code Issues Proposed changes

Ignore volume AZ by default

Browse Source
This commit is contained in:
Matt Pryor 2022-04-01 09:24:48 +01:00
parent e05d38ddac
commit 619d334bda
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
charts/cluster-addons/templates/cloud-config.yaml
View File

@ -44,8 +44,11 @@ extraFiles:
tls-insecure=true tls-insecure=true
{{ "{{-" }} end {{ "}}" }} {{ "{{-" }} end {{ "}}" }}
{{ "{{-" }} end {{ "}}" }} {{ "{{-" }} end {{ "}}" }}
{{- with .Values.openstack.cloudConfig }} {{- range $section, $items := omit .Values.openstack.cloudConfig "Global" }}
{{- nindent 8 . }} [{{ $section }}]
{{- range $name, $value := $items }}
{{ $name }}={{ $value }}
{{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}

3
charts/cluster-addons/values.yaml
View File

@ -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 # 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 # and https://github.com/kubernetes/cloud-provider-openstack/blob/master/docs/cinder-csi-plugin/using-cinder-csi-plugin.md#block-storage
cloudConfig: 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) # Settings for the Cloud Controller Manager (CCM)
ccm: ccm:
# Indicates if the OpenStack CCM should be enabled # Indicates if the OpenStack CCM should be enabled