openstack/openstack-helm
Code Issues Proposed changes

Fix cinder backup secret

Browse Source 
cinder-backup container should reference cinder-backup-rbd-keyring

not cinder-volume-rbd-keyring if the backend driver of cinder backup

is ceph.

Change-Id: Icb7f80a01fc332ee13a42533f8e41e447008c2f4
This commit is contained in:
John Haan 2019-01-09 15:08:40 +09:00
parent f915a85f2b
commit 9447518d58
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cinder/templates/deployment-backup.yaml
View File

@ -162,11 +162,18 @@ spec:
subPath: external-backup-ceph.conf subPath: external-backup-ceph.conf
readOnly: true readOnly: true
{{- end }} {{- end }}
{{- if eq .Values.conf.cinder.DEFAULT.backup_driver "cinder.backup.drivers.ceph" }}
- name: ceph-backup-keyring
mountPath: /tmp/client-keyring
subPath: key
readOnly: true
{{- else }}
- name: ceph-keyring - name: ceph-keyring
mountPath: /tmp/client-keyring mountPath: /tmp/client-keyring
subPath: key subPath: key
readOnly: true readOnly: true
{{- end }} {{- end }}
{{- end }}
{{- if eq .Values.conf.cinder.DEFAULT.backup_driver "cinder.backup.drivers.posix" }} {{- if eq .Values.conf.cinder.DEFAULT.backup_driver "cinder.backup.drivers.posix" }}
- name: cinder-backup - name: cinder-backup
mountPath: {{ .Values.conf.cinder.DEFAULT.backup_posix_path }} mountPath: {{ .Values.conf.cinder.DEFAULT.backup_posix_path }}