openstack/openstack-helm
Code Issues Proposed changes

[nova] Mount ceph-keyring volume when needed

Browse Source 
Change-Id: I7370db4c9177976f90176c027f4d65a3fe5b5649
This commit is contained in:
Hyunsun Moon 2019-02-26 05:49:43 +00:00
parent 00fff1d274
commit 4fa1f8e800
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/templates/daemonset-compute.yaml
View File

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