openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Change heat and mistral to use v3/ec2tokens url"

Browse Source
This commit is contained in:
Jenkins 2017-04-03 10:34:16 +00:00 committed by Gerrit Code Review
commit d36c68c667
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
puppet/services/heat-engine.yaml
View File

@ -112,7 +112,11 @@ outputs:
- {get_param: [EndpointMap, MysqlInternal, host]} - {get_param: [EndpointMap, MysqlInternal, host]}
- '/heat' - '/heat'
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo' - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
heat::keystone_ec2_uri: {get_param: [EndpointMap, KeystoneEC2, uri]} heat::keystone_ec2_uri:
list_join:
- ''
- - {get_param: [EndpointMap, KeystoneV3Internal, uri]}
- '/ec2tokens'
heat::keystone::domain::domain_password: {get_param: HeatStackDomainAdminPassword} heat::keystone::domain::domain_password: {get_param: HeatStackDomainAdminPassword}
heat::engine::auth_encryption_key: heat::engine::auth_encryption_key:
yaql: yaql:

6
puppet/services/mistral-base.yaml
View File

@ -74,7 +74,11 @@ outputs:
mistral::keystone_password: {get_param: MistralPassword} mistral::keystone_password: {get_param: MistralPassword}
mistral::keystone_tenant: 'service' mistral::keystone_tenant: 'service'
mistral::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} 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]} mistral::identity_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
service_config_settings: service_config_settings:
keystone: keystone: