From: Juan Antonio Osorio Robles Date: Wed, 7 Dec 2016 07:15:47 +0000 (+0200) Subject: Use versionless keystone endpoint for barbican-related configurations X-Git-Tag: opnfv-6.0.0~1165^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=11f487f021250c1a018ffd6a4028b1ff8d1de58c;p=apex-tripleo-heat-templates.git Use versionless keystone endpoint for barbican-related configurations castellan (the key manager interface used by nova and cinder) is no longer tied to keystone v3 [1]. So now it's possible to use versionless endpoints for keystone. [1] I124c0ea2d9403d6b530b33f18896c4e7bf4eabb5 Change-Id: Id5d893a6a41077ab76ca59295593a27be5c3004c --- diff --git a/puppet/services/barbican-api.yaml b/puppet/services/barbican-api.yaml index 1f220e6b..4e420750 100644 --- a/puppet/services/barbican-api.yaml +++ b/puppet/services/barbican-api.yaml @@ -136,13 +136,13 @@ outputs: nova::compute::barbican_endpoint: get_param: [EndpointMap, BarbicanInternal, uri] nova::compute::barbican_auth_endpoint: - get_param: [EndpointMap, KeystoneV3Internal, uri] + get_param: [EndpointMap, KeystoneV3Internal, uri_no_suffix] cinder_api: cinder::api::keymgr_api_class: > castellan.key_manager.barbican_key_manager.BarbicanKeyManager cinder::api::keymgr_encryption_api_url: get_param: [EndpointMap, BarbicanInternal, uri] cinder::api::keymgr_encryption_auth_url: - get_param: [EndpointMap, KeystoneV3Internal, uri] + get_param: [EndpointMap, KeystoneV3Internal, uri_no_suffix] metadata_settings: get_attr: [ApacheServiceBase, role_data, metadata_settings]