Merge "Fix cinder backup secret"

2019-01-19 10:18:57 +00:00 · 2019-01-19 10:18:57 +00:00 · 624d737efc
commit 624d737efc
parent 6de134f600 9447518d58
1 changed files with 7 additions and 0 deletions
--- a/cinder/templates/deployment-backup.yaml
+++ b/cinder/templates/deployment-backup.yaml
@ -162,11 +162,18 @@ spec:
              subPath: external-backup-ceph.conf
              readOnly: true
            {{- 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
              mountPath: /tmp/client-keyring
              subPath: key
              readOnly: true
            {{- end }}
+            {{- end }}
            {{- if eq .Values.conf.cinder.DEFAULT.backup_driver "cinder.backup.drivers.posix" }}
            - name: cinder-backup
              mountPath: {{ .Values.conf.cinder.DEFAULT.backup_posix_path }}