From 9447518d58babdd19394eeeafe9be8d76cd701e4 Mon Sep 17 00:00:00 2001
From: John Haan <sjin.han@sk.com>
Date: Wed, 9 Jan 2019 15:08:40 +0900
Subject: [PATCH] Fix cinder backup secret

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
---
 cinder/templates/deployment-backup.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cinder/templates/deployment-backup.yaml b/cinder/templates/deployment-backup.yaml
index 4cb5eb0972..f6c454edf0 100644
--- 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 }}