From c699614b2ddd5b5320d6514c6c895f7ab2150e4c Mon Sep 17 00:00:00 2001 From: intlabs Date: Thu, 12 Oct 2017 16:38:37 -0500 Subject: [PATCH] Heat: Fix stack user domain credential template This PS fixes an error in the heat.conf where the region name was injected into the stack domain user parm for domain name. Change-Id: I14ca3f07a8122d31fd5a8982d783a7b1812ae0e9 --- heat/templates/configmap-etc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/heat/templates/configmap-etc.yaml b/heat/templates/configmap-etc.yaml index f735956e4a..dd99eb1461 100644 --- a/heat/templates/configmap-etc.yaml +++ b/heat/templates/configmap-etc.yaml @@ -68,7 +68,7 @@ limitations under the License. {{- end -}} {{- if empty .Values.conf.heat.DEFAULT.stack_user_domain_name -}} -{{- set .Values.conf.heat.DEFAULT "stack_user_domain_name" .Values.endpoints.identity.auth.stack_user.region_name | quote | trunc 0 -}} +{{- set .Values.conf.heat.DEFAULT "stack_user_domain_name" .Values.endpoints.identity.auth.stack_user.domain_name | quote | trunc 0 -}} {{- end -}} {{- if empty .Values.conf.heat.DEFAULT.stack_domain_admin -}} {{- set .Values.conf.heat.DEFAULT "stack_domain_admin" .Values.endpoints.identity.auth.stack_user.username | quote | trunc 0 -}}