diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-03 10:34:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-03 10:34:16 +0000 |
| commit | d36c68c667bcd9116a4157c6caf84c285a06f3bf (patch) | |
| tree | cc0cfb5fb66d1205bb71cb7168738dbbb560f08a /puppet/services/mistral-base.yaml | |
| parent | 49bad434b912bcd596e75e3a8fb034a78031ed01 (diff) | |
| parent | ffc3ea0f55a198b754d468281eb0803416a6e623 (diff) | |
Merge "Change heat and mistral to use v3/ec2tokens url"
Diffstat (limited to 'puppet/services/mistral-base.yaml')
| -rw-r--r-- | puppet/services/mistral-base.yaml | 6 |
1 files changed, 5 insertions, 1 deletions
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: |