diff --git a/glance/templates/bin/_nginx.sh.tpl b/glance/templates/bin/_nginx.sh.tpl index e44ffd27a9..92b09c0f82 100644 --- a/glance/templates/bin/_nginx.sh.tpl +++ b/glance/templates/bin/_nginx.sh.tpl @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -xe COMMAND="${@:-start}" diff --git a/glance/templates/job-storage-init.yaml b/glance/templates/job-storage-init.yaml index 998612aedc..82524086f7 100644 --- a/glance/templates/job-storage-init.yaml +++ b/glance/templates/job-storage-init.yaml @@ -129,7 +129,7 @@ spec: {{- if eq .Values.storage "swift" }} - name: SWIFT_TMPURL_KEY value: {{ .Values.endpoints.object_store.auth.glance.tmpurlkey | quote }} -{{- with $env := dict "ksUserSecret" $envAll.Values.secrets.identity.glance }} +{{- with $env := dict "ksUserSecret" $envAll.Values.secrets.identity.glance "useCA" .Values.manifests.certificates }} {{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- end }} {{ end }} @@ -160,6 +160,7 @@ spec: - name: glance-images mountPath: {{ .Values.conf.glance.glance_store.filesystem_store_datadir }} {{ end }} +{{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.image.api.internal | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }} volumes: - name: pod-tmp emptyDir: {} @@ -185,4 +186,5 @@ spec: persistentVolumeClaim: claimName: glance-images {{ end }} +{{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.image.api.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }} {{- end }}