openstack
/
openstack-helm
Code Issues Proposed changes

Merge "Clean up the tempest.conf section of the values.yaml"

This commit is contained in:
Zuul 2018-10-01 13:17:06 +00:00 committed by Gerrit Code Review
parent c2929b40b2 9fe7c07e4d
commit a49a39f604
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tempest/templates/configmap-etc.yaml
View File

@ -29,14 +29,10 @@ limitations under the License.
{{- 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.auth.admin_domain_scope -}}
{{- $_ := set .Values.conf.tempest.auth "admin_domain_scope" .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 -}}

15
tempest/values.yaml
View File

@ -121,12 +121,23 @@ conf:
# - (?:tempest\.scenario\.test_network_basic_ops\.TestNetworkBasicOps\.test_update_instance_port_admin_state)
tempest:
auth:
# admin_username value set by configmap-etc
admin_username: None
# admin_password value set by configmap-etc
admin_password: None
# admin_project_name value set by configmap-etc
admin_project_name: None
# admin_domain_name value set by configmap-etc
admin_domain_name: None
use_dynamic_credentials: true
admin_domain_scope: true
tempest_roles: admin, member
min_compute_nodes: 1
identity:
admin_domain_scope: true
auth_version: v3
# region value set by configmap-etc
region: None
# uri_v3 value set by configmap-etc
uri_v3: None
identity-feature-enabled:
api_v2: false
api_v3: true