openstack/tripleo-heat-templates
Code Issues Proposed changes

congress/tacker: switch auth_uri to use uri_no_suffix

Browse Source 
Switch Congress and Tacker to use auth_uri with keystone versionless
endpoint.

Change-Id: I7e17d061344849b0421f3a6c9571f1609e8861fb
Partial-Implement: blueprint keystone-v3
This commit is contained in:
Emilien Macchi 2017-03-10 12:15:47 -05:00
parent ab83e7731c
commit 20003d6deb
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
puppet/services/congress.yaml
View File

@ -74,8 +74,10 @@ outputs:
congress::server::bind_host: {get_param: [ServiceNetMap, CongressApiNetwork]} congress::server::bind_host: {get_param: [ServiceNetMap, CongressApiNetwork]}
congress::keystone::authtoken::project_name: 'service' congress::keystone::authtoken::project_name: 'service'
congress::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} congress::keystone::authtoken::user_domain_name: 'Default'
congress::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} congress::keystone::authtoken::project_domain_name: 'Default'
congress::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
congress::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
congress::db::mysql::password: {get_param: CongressPassword} congress::db::mysql::password: {get_param: CongressPassword}
congress::db::mysql::user: congress congress::db::mysql::user: congress

6
puppet/services/tacker.yaml
View File

@ -75,8 +75,10 @@ outputs:
tacker::server::bind_host: {get_param: [ServiceNetMap, TackerApiNetwork]} tacker::server::bind_host: {get_param: [ServiceNetMap, TackerApiNetwork]}
tacker::keystone::authtoken::project_name: 'service' tacker::keystone::authtoken::project_name: 'service'
tacker::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} tacker::keystone::authtoken::user_domain_name: 'Default'
tacker::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} tacker::keystone::authtoken::project_domain_name: 'Default'
tacker::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
tacker::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
tacker::db::mysql::password: {get_param: TackerPassword} tacker::db::mysql::password: {get_param: TackerPassword}
tacker::db::mysql::user: tacker tacker::db::mysql::user: tacker