From ffc3ea0f55a198b754d468281eb0803416a6e623 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Fri, 31 Mar 2017 14:14:01 +0300 Subject: Change heat and mistral to use v3/ec2tokens url They were using v2.0 and we're getting rid of v2.0/ec2tokens in the EndpointMap. Change-Id: Ib9fbbdb0144bb4e250c561613bba6219506ff30f --- puppet/services/mistral-base.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'puppet/services/mistral-base.yaml') diff --git a/puppet/services/mistral-base.yaml b/puppet/services/mistral-base.yaml index e1030346..d5c21694 100644 --- a/puppet/services/mistral-base.yaml +++ b/puppet/services/mistral-base.yaml @@ -74,7 +74,11 @@ outputs: mistral::keystone_password: {get_param: MistralPassword} mistral::keystone_tenant: 'service' mistral::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} - mistral::keystone_ec2_uri: {get_param: [EndpointMap, KeystoneEC2, uri]} + mistral::keystone_ec2_uri: + list_join: + - '' + - - {get_param: [EndpointMap, KeystoneV3Internal, uri]} + - '/ec2tokens' mistral::identity_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} service_config_settings: keystone: -- cgit 1.2.3-korg