Browse Source

[nova] Mount ceph-keyring volume when needed

Change-Id: I7370db4c9177976f90176c027f4d65a3fe5b5649
Hyunsun Moon 1 month ago
parent
commit
4fa1f8e800
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      nova/templates/daemonset-compute.yaml

+ 2
- 2
nova/templates/daemonset-compute.yaml View File

@@ -263,7 +263,7 @@ spec:
263 263
               {{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "10" ) }}
264 264
               mountPropagation: Bidirectional
265 265
               {{- end }}
266
-            {{- if empty .Values.conf.ceph.cinder.keyring }}
266
+            {{- if and ( empty .Values.conf.ceph.cinder.keyring ) ( empty .Values.conf.ceph.admin_keyring )}}
267 267
             - name: ceph-keyring
268 268
               mountPath: /tmp/client-keyring
269 269
               subPath: key
@@ -343,7 +343,7 @@ spec:
343 343
           configMap:
344 344
             name: {{ .Values.ceph_client.configmap }}
345 345
             defaultMode: 0444
346
-        {{- if empty .Values.conf.ceph.cinder.keyring }}
346
+        {{- if and ( empty .Values.conf.ceph.cinder.keyring ) ( empty .Values.conf.ceph.admin_keyring ) }}
347 347
         - name: ceph-keyring
348 348
           secret:
349 349
             secretName: {{ .Values.ceph_client.user_secret_name }}

Loading…
Cancel
Save