From 4fa1f8e800179c4bbca38a6a55b3bb847cde991d Mon Sep 17 00:00:00 2001
From: Hyunsun Moon <hyunsun.moon@gmail.com>
Date: Tue, 26 Feb 2019 05:49:43 +0000
Subject: [PATCH] [nova] Mount ceph-keyring volume when needed

Change-Id: I7370db4c9177976f90176c027f4d65a3fe5b5649
---
 nova/templates/daemonset-compute.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml
index 35236bdadc..64f0a6767c 100644
--- a/nova/templates/daemonset-compute.yaml
+++ b/nova/templates/daemonset-compute.yaml
@@ -263,7 +263,7 @@ spec:
               {{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "10" ) }}
               mountPropagation: Bidirectional
               {{- end }}
-            {{- if empty .Values.conf.ceph.cinder.keyring }}
+            {{- if and ( empty .Values.conf.ceph.cinder.keyring ) ( empty .Values.conf.ceph.admin_keyring )}}
             - name: ceph-keyring
               mountPath: /tmp/client-keyring
               subPath: key
@@ -343,7 +343,7 @@ spec:
           configMap:
             name: {{ .Values.ceph_client.configmap }}
             defaultMode: 0444
-        {{- if empty .Values.conf.ceph.cinder.keyring }}
+        {{- if and ( empty .Values.conf.ceph.cinder.keyring ) ( empty .Values.conf.ceph.admin_keyring ) }}
         - name: ceph-keyring
           secret:
             secretName: {{ .Values.ceph_client.user_secret_name }}