openstack/openstack-helm
Code Issues Proposed changes

Merge "feat(tls): Add CA cert to glance storage init"

Browse Source
This commit is contained in:
Zuul 2020-07-30 17:04:03 +00:00 committed by Gerrit Code Review
commit 848c443f35
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glance/templates/bin/_nginx.sh.tpl
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
set -xe set -xe
COMMAND="${@:-start}" COMMAND="${@:-start}"

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

@ -129,7 +129,7 @@ spec:
{{- if eq .Values.storage "swift" }} {{- if eq .Values.storage "swift" }}
- name: SWIFT_TMPURL_KEY - name: SWIFT_TMPURL_KEY
value: {{ .Values.endpoints.object_store.auth.glance.tmpurlkey | quote }} 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 }} {{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }}
{{- end }} {{- end }}
{{ end }} {{ end }}
@ -160,6 +160,7 @@ spec:
- name: glance-images - name: glance-images
mountPath: {{ .Values.conf.glance.glance_store.filesystem_store_datadir }} mountPath: {{ .Values.conf.glance.glance_store.filesystem_store_datadir }}
{{ end }} {{ end }}
{{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.image.api.internal | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
volumes: volumes:
- name: pod-tmp - name: pod-tmp
emptyDir: {} emptyDir: {}
@ -185,4 +186,5 @@ spec:
persistentVolumeClaim: persistentVolumeClaim:
claimName: glance-images claimName: glance-images
{{ end }} {{ end }}
{{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.image.api.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
{{- end }} {{- end }}