From 82065e3bb1186603b5c74bca9bcf4cdc29d26596 Mon Sep 17 00:00:00 2001
From: josebb <jose.bautista.barato@gmail.com>
Date: Wed, 4 May 2022 21:05:23 +0300
Subject: [PATCH] Add configuration for heat-tempest-plugin

Change-Id: I6402a18038f349225696ae0c23c30d55623766a7
---
 releasenotes/notes/tempest.yaml      |  1 +
 tempest/Chart.yaml                   |  2 +-
 tempest/templates/configmap-etc.yaml | 32 ++++++++++++++++++++++++++++
 tempest/values.yaml                  | 18 ++++++++++++++++
 4 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/releasenotes/notes/tempest.yaml b/releasenotes/notes/tempest.yaml
index 243f85b382..35e5ccd06a 100644
--- a/releasenotes/notes/tempest.yaml
+++ b/releasenotes/notes/tempest.yaml
@@ -9,4 +9,5 @@ tempest:
   - 0.2.4 Update default image values to Wallaby
   - 0.2.5 Added OCI registry authentication
   - 0.2.6 Support SSL openstack endpoints
+  - 0.2.7 Add configuration for heat-tempest-plugin
 ...
diff --git a/tempest/Chart.yaml b/tempest/Chart.yaml
index 56c4ce4723..406e963ba7 100644
--- a/tempest/Chart.yaml
+++ b/tempest/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Tempest
 name: tempest
-version: 0.2.6
+version: 0.2.7
 home: https://docs.openstack.org/tempest/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/tempest/OpenStack_Project_tempest_vertical.png
 sources:
diff --git a/tempest/templates/configmap-etc.yaml b/tempest/templates/configmap-etc.yaml
index 8e136c9353..025a2701b1 100644
--- a/tempest/templates/configmap-etc.yaml
+++ b/tempest/templates/configmap-etc.yaml
@@ -35,6 +35,38 @@ limitations under the License.
 {{- $_ := set .Values.conf.tempest.identity "region" .Values.endpoints.identity.auth.admin.region_name -}}
 {{- end -}}
 
+{{- if .Values.conf.tempest.service_available.heat -}}
+{{- if empty .Values.conf.tempest.heat_plugin.username -}}
+{{- $_ := set .Values.conf.tempest.heat_plugin "username" .Values.endpoints.identity.auth.tempest.username -}}
+{{- end -}}
+{{- if empty .Values.conf.tempest.heat_plugin.password -}}
+{{- $_ := set .Values.conf.tempest.heat_plugin "password" .Values.endpoints.identity.auth.tempest.password -}}
+{{- end -}}
+{{- if empty .Values.conf.tempest.heat_plugin.project_name -}}
+{{- $_ := set .Values.conf.tempest.heat_plugin "project_name" .Values.endpoints.identity.auth.tempest.project_name -}}
+{{- end -}}
+{{- if empty .Values.conf.tempest.heat_plugin.admin_username -}}
+{{- $_ := set .Values.conf.tempest.heat_plugin "admin_username" .Values.endpoints.identity.auth.admin.username -}}
+{{- end -}}
+{{- if empty .Values.conf.tempest.heat_plugin.admin_password -}}
+{{- $_ := set .Values.conf.tempest.heat_plugin "admin_password" .Values.endpoints.identity.auth.admin.password -}}
+{{- end -}}
+{{- if empty .Values.conf.tempest.heat_plugin.admin_project_name -}}
+{{- $_ := set .Values.conf.tempest.heat_plugin "admin_project_name" .Values.endpoints.identity.auth.admin.project_name -}}
+{{- end -}}
+{{- if empty .Values.conf.tempest.heat_plugin.auth_url -}}
+{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.tempest.heat_plugin "auth_url" -}}
+{{- end -}}
+{{- if empty .Values.conf.tempest.heat_plugin.region -}}
+{{- $_ := set .Values.conf.tempest.heat_plugin "region" .Values.endpoints.identity.auth.admin.region_name -}}
+{{- end -}}
+{{- if empty .Values.conf.tempest.heat_plugin.project_domain_name -}}
+{{- $_ := set .Values.conf.tempest.heat_plugin "project_domain_name" .Values.endpoints.identity.auth.tempest.project_domain_name -}}
+{{- end -}}
+{{- if empty .Values.conf.tempest.heat_plugin.user_domain_name -}}
+{{- $_ := set .Values.conf.tempest.heat_plugin "user_domain_name" .Values.endpoints.identity.auth.tempest.user_domain_name -}}
+{{- end -}}
+{{- end -}}
 
 {{- if empty .Values.conf.tempest.dashboard.dashboard_url -}}
 {{- $endpointScheme := tuple "dashboard" "public" "web" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" }}
diff --git a/tempest/values.yaml b/tempest/values.yaml
index abe5c2085a..a903143ccb 100644
--- a/tempest/values.yaml
+++ b/tempest/values.yaml
@@ -137,6 +137,23 @@ conf:
       admin_domain_name: null
       use_dynamic_credentials: true
     dashboard: {}
+    heat_plugin:
+      # Username to use for non admin API requests
+      username: null
+      # Non admin API key to use when authenticating.
+      password: null
+      project_name: null
+      # Username to use for admin API requests
+      admin_username: null
+      # Admin API key to use when authentication
+      admin_password: null
+      # Admin project name to use for admin API requests
+      admin_project_name: null
+      auth_version: 3
+      auth_url: null
+      user_domain_name: null
+      project_domain_name: null
+      region: null
     identity:
       admin_domain_scope: false
       auth_version: v3
@@ -203,6 +220,7 @@ conf:
       # tempest image used includes a bug resulting in failed network tests that
       # wasn't fixed in newton. Swift is disabled by default as the swift chart
       # isn't complete
+      heat: false
       neutron: false
       nova: false
       swift: false