Merge "heat : fix heat trustee configuration"

This commit is contained in:
Zuul 2019-01-31 08:18:05 +00:00 committed by Gerrit Code Review
commit 64e79b7065

View File

@ -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 -}}