Merge tag '3.0.3' into debian/ussuri
castellan 3.0.3 release
meta:version: 3.0.3
meta:diff-start: -
meta:series: ussuri
meta:release-type: release
meta:pypi: no
meta:first: no
meta:release:Author: Daniel Bengtsson <dbengt@redhat.com>
meta:release:Commit: Thierry Carrez <thierry@openstack.org>
meta:release:Change-Id: I30af6f079d1c2f2bdaf84b347fe028417c972bd0
meta:release:Code-Review+2: Hervé Beraud <hberaud@redhat.com>
meta:release:Code-Review+2: Sean McGinnis <sean.mcginnis@gmail.com>
meta:release:Workflow+1: Thierry Carrez <thierry@openstack.org>
Michal Arbet
3 years ago
192 | 192 | return barbican.barbican_endpoint |
193 | 193 | elif getattr(auth, 'service_catalog', None): |
194 | 194 | endpoint_data = auth.service_catalog.endpoint_data_for( |
195 | service_type='key-manager') | |
195 | service_type='key-manager', | |
196 | interface=barbican.barbican_endpoint_type) | |
196 | 197 | return endpoint_data.url |
197 | 198 | else: |
198 | 199 | service_parameters = {'service_type': 'key-manager', |