Browse Source

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

tags/3.5.0^0
Zuul 1 month ago
committed by Gerrit Code Review
parent
commit
3d39e35459
2 changed files with 8 additions and 1 deletions
  1. +2
    -1
      castellan/key_manager/barbican_key_manager.py
  2. +6
    -0
      releasenotes/notes/use-barbican-endpoint-type-config-option-e583d30930cc22ba.yaml

+ 2
- 1
castellan/key_manager/barbican_key_manager.py View File

@@ -193,7 +193,8 @@ class BarbicanKeyManager(key_manager.KeyManager):
return barbican.barbican_endpoint
elif getattr(auth, 'service_catalog', None):
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
else:
service_parameters = {'service_type': 'key-manager',


+ 6
- 0
releasenotes/notes/use-barbican-endpoint-type-config-option-e583d30930cc22ba.yaml 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.

Loading…
Cancel
Save