diff --git a/cinder/templates/bin/_cinder-volume.sh.tpl b/cinder/templates/bin/_cinder-volume.sh.tpl index 8f4973ec09..830c8e07ef 100644 --- a/cinder/templates/bin/_cinder-volume.sh.tpl +++ b/cinder/templates/bin/_cinder-volume.sh.tpl @@ -16,4 +16,5 @@ set -ex exec cinder-volume \ - --config-file /etc/cinder/cinder.conf + --config-file /etc/cinder/cinder.conf \ + --config-file /etc/cinder/conf/backends.conf diff --git a/cinder/templates/configmap-etc.yaml b/cinder/templates/configmap-etc.yaml index 99d1f94440..6e050e26cb 100644 --- a/cinder/templates/configmap-etc.yaml +++ b/cinder/templates/configmap-etc.yaml @@ -98,13 +98,13 @@ data: {{- else -}} {{ tuple "etc/_policy.json.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} -{{- if or (include "cinder.is_ceph_configured" .) (eq .Values.conf.cinder.default.cinder.backup_driver "cinder.backup.drivers.ceph") -}} ceph.conf: |+ +{{- if or (include "cinder.is_ceph_configured" .) (eq .Values.conf.cinder.default.cinder.backup_driver "cinder.backup.drivers.ceph") }} {{ if .Values.conf.ceph.override -}} {{ .Values.conf.ceph.override | indent 4 }} {{- else -}} -{{- end }} {{ tuple "etc/_ceph.conf.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} +{{- end }} {{- if .Values.conf.ceph.append -}} {{ .Values.conf.ceph.append | indent 4 }} {{- end }} diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml index d9b42a2c07..3c7142ffc9 100644 --- a/cinder/templates/deployment-volume.yaml +++ b/cinder/templates/deployment-volume.yaml @@ -79,6 +79,7 @@ spec: mountPath: /etc/ceph/ceph.conf subPath: ceph.conf readOnly: true + - name: cinder-etc mountPath: /etc/ceph/ceph.client.{{ .Values.conf.backends.rbd1.rbd_user }}.keyring subPath: ceph.client.{{ .Values.conf.backends.rbd1.rbd_user }}.keyring readOnly: true