openstack
/
castellan
Code Issues Proposed changes

Merge "Use 'barbican_endpoint_type'config option to get endpoint from catalog"

This commit is contained in:
Zuul 2020-08-25 11:02:20 +00:00 committed by Gerrit Code Review
parent ecf2b1fae6 e63d813a70
commit 3d39e35459
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
castellan/key_manager/barbican_key_manager.py
View File

@ -193,7 +193,8 @@ class BarbicanKeyManager(key_manager.KeyManager):
return barbican.barbican_endpoint return barbican.barbican_endpoint
elif getattr(auth, 'service_catalog', None): elif getattr(auth, 'service_catalog', None):
endpoint_data = auth.service_catalog.endpoint_data_for( endpoint_data = auth.service_catalog.endpoint_data_for(
service_type='key-manager') service_type='key-manager',
interface=barbican.barbican_endpoint_type)
return endpoint_data.url return endpoint_data.url
else: else:
service_parameters = {'service_type': 'key-manager', service_parameters = {'service_type': 'key-manager',

6
releasenotes/notes/use-barbican-endpoint-type-config-option-e583d30930cc22ba.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
``barbican_endpoint_type`` is now used to retrieve Barbican endpoint URL
from service catalog. This config option is set to 'public' by default so
it will not change the current behaviour.