openstack/openstack-helm
Code Issues Proposed changes

Don't mount pvc-ceph-client-key when not used

Browse Source 
Closes-Bug: 1755975
Change-Id: I65a2e99cecce63bdae20f6e83cf62edf5327d7c6
This commit is contained in:
Hyunsun Moon 2018-04-17 17:01:02 +09:00
parent 784941ca73
commit 7295f308cc
5 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/templates/job-backup-storage-init.yaml
View File

@ -80,10 +80,12 @@ spec:
mountPath: /tmp/ceph-admin-keyring.sh
subPath: ceph-admin-keyring.sh
readOnly: true
{{- if empty .Values.conf.ceph.admin_keyring }}
- name: ceph-keyring
mountPath: /tmp/client-keyring
subPath: key
readOnly: true
{{ end }}
{{ end }}
containers:
- name: cinder-backup-storage-init
@ -125,11 +127,13 @@ spec:
mountPath: /etc/ceph/ceph.conf
subPath: ceph.conf
readOnly: true
{{- if empty .Values.conf.ceph.admin_keyring }}
- name: ceph-keyring
mountPath: /tmp/client-keyring
subPath: key
readOnly: true
{{- end }}
{{- end }}
volumes:
- name: cinder-bin
configMap:
@ -142,8 +146,10 @@ spec:
configMap:
name: ceph-etc
defaultMode: 0444
{{- if empty .Values.conf.ceph.admin_keyring }}
- name: ceph-keyring
secret:
secretName: pvc-ceph-client-key
{{ end }}
{{ end }}
{{- end }}

6
cinder/templates/job-storage-init.yaml
View File

@ -80,10 +80,12 @@ spec:
mountPath: /tmp/ceph-admin-keyring.sh
subPath: ceph-admin-keyring.sh
readOnly: true
{{- if empty .Values.conf.ceph.admin_keyring }}
- name: ceph-keyring
mountPath: /tmp/client-keyring
subPath: key
readOnly: true
{{ end }}
{{ end }}
containers:
- name: cinder-storage-init
@ -125,11 +127,13 @@ spec:
mountPath: /etc/ceph/ceph.conf
subPath: ceph.conf
readOnly: true
{{- if empty .Values.conf.ceph.admin_keyring }}
- name: ceph-keyring
mountPath: /tmp/client-keyring
subPath: key
readOnly: true
{{- end }}
{{- end }}
volumes:
- name: cinder-bin
configMap:
@ -142,8 +146,10 @@ spec:
configMap:
name: ceph-etc
defaultMode: 0444
{{- if empty .Values.conf.ceph.admin_keyring }}
- name: ceph-keyring
secret:
secretName: pvc-ceph-client-key
{{- end }}
{{- end }}
{{- end }}

6
glance/templates/job-storage-init.yaml
View File

@ -80,10 +80,12 @@ spec:
mountPath: /tmp/ceph-admin-keyring.sh
subPath: ceph-admin-keyring.sh
readOnly: true
{{- if empty .Values.conf.ceph.admin_keyring }}
- name: ceph-keyring
mountPath: /tmp/client-keyring
subPath: key
readOnly: true
{{ end }}
{{ end }}
containers:
- name: glance-storage-init
@ -129,11 +131,13 @@ spec:
mountPath: /etc/ceph/ceph.conf
subPath: ceph.conf
readOnly: true
{{- if empty .Values.conf.ceph.admin_keyring }}
- name: ceph-keyring
mountPath: /tmp/client-keyring
subPath: key
readOnly: true
{{ end }}
{{ end }}
{{- if eq .Values.storage "pvc" }}
- name: glance-images
mountPath: {{ .Values.conf.glance.glance_store.filesystem_store_datadir }}
@ -150,10 +154,12 @@ spec:
configMap:
name: ceph-etc
defaultMode: 0444
{{- if empty .Values.conf.ceph.admin_keyring }}
- name: ceph-keyring
secret:
secretName: pvc-ceph-client-key
{{ end }}
{{ end }}
{{- if eq .Values.storage "pvc" }}
- name: glance-images
persistentVolumeClaim:

6
libvirt/templates/daemonset-libvirt.yaml
View File

@ -70,10 +70,12 @@ spec:
mountPath: /tmp/ceph-keyring.sh
subPath: ceph-keyring.sh
readOnly: true
{{- if empty .Values.ceph.cinder_keyring }}
- name: ceph-keyring
mountPath: /tmp/client-keyring
subPath: key
readOnly: true
{{ end }}
{{- end }}
containers:
- name: libvirt
@ -134,11 +136,13 @@ spec:
mountPath: /etc/ceph/ceph.conf
subPath: ceph.conf
readOnly: true
{{- if empty .Values.ceph.cinder_keyring }}
- name: ceph-keyring
mountPath: /tmp/client-keyring
subPath: key
readOnly: true
{{- end }}
{{- end }}
{{ if $mounts_libvirt.volumeMounts }}{{ toYaml $mounts_libvirt.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: libvirt-bin
@ -156,10 +160,12 @@ spec:
configMap:
name: ceph-etc
defaultMode: 0444
{{- if empty .Values.ceph.cinder_keyring }}
- name: ceph-keyring
secret:
secretName: pvc-ceph-client-key
{{ end }}
{{ end }}
- name: libmodules
hostPath:
path: /lib/modules

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

@ -87,10 +87,12 @@ spec:
- name: nova-bin
mountPath: /tmp/ceph-keyring.sh
subPath: ceph-keyring.sh
{{- if empty .Values.ceph.cinder_keyring }}
- name: ceph-keyring
mountPath: /tmp/client-keyring
subPath: key
readOnly: true
{{ end }}
{{ end }}
{{- if eq .Values.console.console_kind "novnc"}}
- name: nova-compute-vnc-init
@ -198,11 +200,13 @@ spec:
mountPath: /etc/ceph/ceph.conf
subPath: ceph.conf
readOnly: true
{{- if empty .Values.ceph.cinder_keyring }}
- name: ceph-keyring
mountPath: /tmp/client-keyring
subPath: key
readOnly: true
{{ end }}
{{ end }}
- mountPath: /lib/modules
name: libmodules
readOnly: true
@ -269,10 +273,12 @@ spec:
configMap:
name: ceph-etc
defaultMode: 0444
{{- if empty .Values.ceph.cinder_keyring }}
- name: ceph-keyring
secret:
secretName: pvc-ceph-client-key
{{ end }}
{{ end }}
- name: libmodules
hostPath:
path: /lib/modules