From 9fe7c07e4d4a644c5f5b94e47118b24ac9c85538 Mon Sep 17 00:00:00 2001
From: Doug Schveninger <ds6901@att.com>
Date: Tue, 25 Sep 2018 07:54:52 -0500
Subject: [PATCH] Clean up the tempest.conf section of the values.yaml

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
---
 tempest/templates/configmap-etc.yaml |  4 ----
 tempest/values.yaml                  | 15 +++++++++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/tempest/templates/configmap-etc.yaml b/tempest/templates/configmap-etc.yaml
index 855c460787..cb3775a106 100644
--- a/tempest/templates/configmap-etc.yaml
+++ b/tempest/templates/configmap-etc.yaml
@@ -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 -}}
diff --git a/tempest/values.yaml b/tempest/values.yaml
index 0ff3627c93..7ceb5f434b 100644
--- a/tempest/values.yaml
+++ b/tempest/values.yaml
@@ -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