From 6b552087aae5ee98265e9a6fde8180730579f86f Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Tue, 7 Mar 2017 01:35:27 +0000 Subject: [PATCH] Fix post.sh for Nova with KS Endpoint type lookup function --- nova/templates/bin/_post.sh.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nova/templates/bin/_post.sh.tpl b/nova/templates/bin/_post.sh.tpl index ebb4515cf6..0afd1ae545 100644 --- a/nova/templates/bin/_post.sh.tpl +++ b/nova/templates/bin/_post.sh.tpl @@ -58,10 +58,10 @@ auth='{{ include "helm-toolkit.keystone_auth" .}}'" \ cat </tmp/openrc export OS_USERNAME={{.Values.keystone.admin_user}} export OS_PASSWORD={{.Values.keystone.admin_password}} -export OS_PROJECT_DOMAIN_NAME={{.Values.keystone.domain_name}} -export OS_USER_DOMAIN_NAME={{.Values.keystone.domain_name}} +export OS_PROJECT_DOMAIN_NAME={{.Values.keystone.admin_user_domain}} +export OS_USER_DOMAIN_NAME={{.Values.keystone.admin_user_domain}} export OS_PROJECT_NAME={{.Values.keystone.admin_project_name}} -export OS_AUTH_URL={{include "helm-toolkit.endpoint_keystone_internal" .}} +export OS_AUTH_URL={{ tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" }} export OS_AUTH_STRATEGY=keystone export OS_REGION_NAME={{.Values.keystone.admin_region_name}} export OS_INSECURE=1