Support SSL openstack endpoints in tempest

Change-Id: Id396e2af5fa078395707ef4c5193d42857e63469
This commit is contained in:
josebb 2022-02-03 09:08:45 +02:00
parent ced30abead
commit d3dfb29e3e
5 changed files with 18 additions and 1 deletions

View File

@ -8,4 +8,5 @@ tempest:
- 0.2.3 Fix logging config - 0.2.3 Fix logging config
- 0.2.4 Update default image values to Wallaby - 0.2.4 Update default image values to Wallaby
- 0.2.5 Added OCI registry authentication - 0.2.5 Added OCI registry authentication
- 0.2.6 Support SSL openstack endpoints
... ...

View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Tempest description: OpenStack-Helm Tempest
name: tempest name: tempest
version: 0.2.5 version: 0.2.6
home: https://docs.openstack.org/tempest/latest/ home: https://docs.openstack.org/tempest/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/tempest/OpenStack_Project_tempest_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/tempest/OpenStack_Project_tempest_vertical.png
sources: sources:

View File

@ -23,5 +23,8 @@ helm.sh/hook-weight: "-1"
{{- if .Values.helm3_hook }} {{- if .Values.helm3_hook }}
{{- $_ := set $ksUserJob "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) -}} {{- $_ := set $ksUserJob "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) -}}
{{- end }} {{- end }}
{{- if or .Values.manifests.certificates .Values.tls.identity -}}
{{- $_ := set $ksUserJob "tlsSecret" .Values.secrets.tls.identity.api.internal -}}
{{- end -}}
{{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }} {{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }}
{{- end }} {{- end }}

View File

@ -61,6 +61,10 @@ spec:
command: command:
- /tmp/run-tests.sh - /tmp/run-tests.sh
env: env:
{{- if or .Values.manifests.certificates .Values.tls.identity }}
- name: REQUESTS_CA_BUNDLE
value: "/etc/tempest/certs/ca.crt"
{{- end }}
{{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }} {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}
{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }}
{{- end }} {{- end }}
@ -95,6 +99,7 @@ spec:
{{- end }} {{- end }}
- name: tempest-reports - name: tempest-reports
mountPath: /var/lib/tempest/data mountPath: /var/lib/tempest/data
{{- dict "enabled" (or .Values.manifests.certificates .Values.tls.identity) "name" .Values.secrets.tls.identity.api.internal "path" "/etc/tempest/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
volumes: volumes:
- name: pod-tmp - name: pod-tmp
emptyDir: {} emptyDir: {}
@ -115,4 +120,5 @@ spec:
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ .Values.pvc.name }} claimName: {{ .Values.pvc.name }}
{{- end }} {{- end }}
{{- dict "enabled" (or .Values.manifests.certificates .Values.tls.identity) "name" .Values.secrets.tls.identity.api.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
{{- end }} {{- end }}

View File

@ -269,6 +269,11 @@ secrets:
tempest: tempest-keystone-user tempest: tempest-keystone-user
oci_image_registry: oci_image_registry:
tempest: tempest-oci-image-registry tempest: tempest-oci-image-registry
tls:
identity:
api:
public: keystone-tls-public
internal: keystone-tls-api
endpoints: endpoints:
cluster_domain_suffix: cluster.local cluster_domain_suffix: cluster.local
@ -351,6 +356,8 @@ endpoints:
port: port:
web: web:
default: 80 default: 80
tls:
identity: false
manifests: manifests:
configmap_bin: true configmap_bin: true