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

Closes-Bug: 1755975
Change-Id: I65a2e99cecce63bdae20f6e83cf62edf5327d7c6

cinder/templates/job-backup-storage-init.yaml

@@ -80,11 +80,13 @@ 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
           image: {{ .Values.images.tags.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 }}

cinder/templates/job-storage-init.yaml

@@ -80,11 +80,13 @@ 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
           image: {{ .Values.images.tags.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 }}

glance/templates/job-storage-init.yaml

@@ -80,11 +80,13 @@ 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
           image: {{ .Values.images.tags.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:

libvirt/templates/daemonset-libvirt.yaml

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

nova/templates/daemonset-compute.yaml

@@ -87,11 +87,13 @@ 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
           image: {{ .Values.images.tags.nova_compute }}
@@ -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