openstack/openstack-helm
Code Issues Proposed changes

Merge "[Cinder] Fix Ceph backend"

Browse Source
This commit is contained in:
Jenkins 2017-06-10 15:30:37 +00:00 committed by Gerrit Code Review
commit 2ae4147dc8
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cinder/templates/bin/_cinder-volume.sh.tpl
View File

@ -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

4
cinder/templates/configmap-etc.yaml
View File

@ -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 }}

1
cinder/templates/deployment-volume.yaml
View File

@ -78,6 +78,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