diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-01-26 16:55:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-01-26 16:55:07 +0000 |
| commit | ded2386f8b867d5d35b4cb0274bbb1af99f3364f (patch) | |
| tree | b4eb50381b2ee2b694e87aeacc7492e5420b6e9f /puppet/services | |
| parent | ddab481e2309ae1b4708fa51658c81529a23f7f9 (diff) | |
| parent | 11f487f021250c1a018ffd6a4028b1ff8d1de58c (diff) | |
Merge "Use versionless keystone endpoint for barbican-related configurations"
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/barbican-api.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
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] |