From ff2db24c07a0c74e6c251e3d311accb25d8f364c Mon Sep 17 00:00:00 2001 From: DaeSeong Kim Date: Mon, 28 Jan 2019 00:47:06 -0800 Subject: [PATCH] heat : fix heat trustee configuration This PS removes project_XXX in heat.conf [trustee] section. See below openstack commit. https://git.openstack.org/cgit/openstack/openstack-manuals/commit/?id=5a3618d4f51a64cc9ef16d9365aa7190b3f5914e Change-Id: I858528856fca47de7e352b1f49e3cfdf5a1b66ab --- heat/templates/configmap-etc.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/heat/templates/configmap-etc.yaml b/heat/templates/configmap-etc.yaml index e89012d664..054e0321c2 100644 --- a/heat/templates/configmap-etc.yaml +++ b/heat/templates/configmap-etc.yaml @@ -47,12 +47,6 @@ limitations under the License. {{- if empty .Values.conf.heat.trustee.region_name -}} {{- $_ := set .Values.conf.heat.trustee "region_name" .Values.endpoints.identity.auth.heat_trustee.region_name -}} {{- end -}} -{{- if empty .Values.conf.heat.trustee.project_name -}} -{{- $_ := set .Values.conf.heat.trustee "project_name" .Values.endpoints.identity.auth.heat_trustee.project_name -}} -{{- end -}} -{{- if empty .Values.conf.heat.trustee.project_domain_name -}} -{{- $_ := set .Values.conf.heat.trustee "project_domain_name" .Values.endpoints.identity.auth.heat_trustee.project_domain_name -}} -{{- end -}} {{- if empty .Values.conf.heat.trustee.user_domain_name -}} {{- $_ := set .Values.conf.heat.trustee "user_domain_name" .Values.endpoints.identity.auth.heat_trustee.user_domain_name -}} {{- end -}}