openstack/tripleo-heat-templates
Code Issues Proposed changes

barbican: Use versionless keystone endpoints

Browse Source 
This also moves the explicit usages of the Keystone V3 endpoint fromt he
EndpointMap, as using the uri_no_suffix defeats that usage.

Change-Id: I5f07a0cee07fa28b88c419e25e014094004b1bce
Partial-Implement: blueprint keystone-v3
This commit is contained in:
Juan Antonio Osorio Robles 2017-03-08 10:17:11 +02:00
parent ed2b3b773f
commit d4549c767f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
puppet/services/barbican-api.yaml
View File

@ -74,7 +74,7 @@ outputs:
map_merge: map_merge:
- get_attr: [ApacheServiceBase, role_data, config_settings] - get_attr: [ApacheServiceBase, role_data, config_settings]
- barbican::keystone::authtoken::password: {get_param: BarbicanPassword} - barbican::keystone::authtoken::password: {get_param: BarbicanPassword}
barbican::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} barbican::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
barbican::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} barbican::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
barbican::keystone::authtoken::project_name: 'service' barbican::keystone::authtoken::project_name: 'service'
barbican::api::host_href: {get_param: [EndpointMap, BarbicanPublic, uri]} barbican::api::host_href: {get_param: [EndpointMap, BarbicanPublic, uri]}
@ -135,14 +135,14 @@ outputs:
nova::compute::barbican_endpoint: nova::compute::barbican_endpoint:
get_param: [EndpointMap, BarbicanInternal, uri] get_param: [EndpointMap, BarbicanInternal, uri]
nova::compute::barbican_auth_endpoint: nova::compute::barbican_auth_endpoint:
get_param: [EndpointMap, KeystoneV3Internal, uri_no_suffix] get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]
cinder_api: cinder_api:
cinder::api::keymgr_api_class: > cinder::api::keymgr_api_class: >
castellan.key_manager.barbican_key_manager.BarbicanKeyManager castellan.key_manager.barbican_key_manager.BarbicanKeyManager
cinder::api::keymgr_encryption_api_url: cinder::api::keymgr_encryption_api_url:
get_param: [EndpointMap, BarbicanInternal, uri] get_param: [EndpointMap, BarbicanInternal, uri]
cinder::api::keymgr_encryption_auth_url: cinder::api::keymgr_encryption_auth_url:
get_param: [EndpointMap, KeystoneV3Internal, uri_no_suffix] get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]
metadata_settings: metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings] get_attr: [ApacheServiceBase, role_data, metadata_settings]
upgrade_tasks: upgrade_tasks: