Merge "Use 'barbican_endpoint_type'config option to get endpoint from catalog"
This commit is contained in:
commit
3d39e35459
|
@ -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',
|
||||||
|
|
|
@ -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.
|
Loading…
Reference in New Issue