9fe7c07e4d
While running chart internal to AT&T we found some tempest.conf values that are not mapped to the correct section of the tempest config.py. This commmit is to address these changes: 1) tempest.auth.admin_domain_scope should be in tempest.identity.admin_domain_scope default is false and existing code is setting the value to true so it is needed https://github.com/openstack/tempest/blob/master/tempest/config.py#L109 2) tempest.auth.min_compute_nodes should be in tempest.compute.min_compute_nodes but it is setting the default value so this is not needed and I am dropping it https://github.com/openstack/tempest/blob/14.0.0/tempest/config.py#L231 Also while learning about the chart we found that the admin_domain_scope configmap-etc was mappinng the wrong data type so we removed the map and set the admin_domain_scope to true. Change-Id: I52f115c3a1afee0fd58ef9422c6353ea1a93e814
55 lines
2.2 KiB
YAML
55 lines
2.2 KiB
YAML
{{/*
|
|
Copyright 2017 The Openstack-Helm Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/}}
|
|
|
|
{{- if .Values.manifests.configmap_etc }}
|
|
{{- $envAll := . }}
|
|
|
|
{{- if empty .Values.conf.tempest.auth.admin_username -}}
|
|
{{- $_ := set .Values.conf.tempest.auth "admin_username" .Values.endpoints.identity.auth.admin.username -}}
|
|
{{- end -}}
|
|
{{- if empty .Values.conf.tempest.auth.admin_password -}}
|
|
{{- $_ := set .Values.conf.tempest.auth "admin_password" .Values.endpoints.identity.auth.admin.password -}}
|
|
{{- end -}}
|
|
{{- if empty .Values.conf.tempest.auth.admin_project_name -}}
|
|
{{- $_ := set .Values.conf.tempest.auth "admin_project_name" .Values.endpoints.identity.auth.admin.project_name -}}
|
|
{{- end -}}
|
|
{{- if empty .Values.conf.tempest.auth.admin_domain_name -}}
|
|
{{- $_ := set .Values.conf.tempest.auth "admin_domain_name" .Values.endpoints.identity.auth.admin.user_domain_name -}}
|
|
{{- end -}}
|
|
|
|
{{- if empty .Values.conf.tempest.identity.uri_v3 -}}
|
|
{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.tempest.identity "uri_v3" -}}
|
|
{{- end -}}
|
|
{{- if empty .Values.conf.tempest.identity.region -}}
|
|
{{- $_ := set .Values.conf.tempest.identity "region" .Values.endpoints.identity.auth.admin.region_name -}}
|
|
{{- end -}}
|
|
|
|
---
|
|
apiVersion: v1
|
|
kind: Secret
|
|
metadata:
|
|
name: tempest-etc
|
|
type: Opaque
|
|
data:
|
|
tempest.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.tempest | b64enc }}
|
|
{{ if not (empty .Values.conf.blacklist) }}
|
|
test-blacklist: {{ include "tempest.utils.to_regex_file" .Values.conf.blacklist | b64enc }}
|
|
{{ end }}
|
|
{{ if not (empty .Values.conf.whitelist) }}
|
|
test-whitelist: {{ include "tempest.utils.to_regex_file" .Values.conf.whitelist | b64enc }}
|
|
{{ end }}
|
|
{{- end }}
|