Simplify the reference to barbican parameters
... so that we can easily identify the logics which are referring to configuration parameters. Change-Id: I93427a64b83f474c7c2dd45c8c200e7a3c9bc6f9
This commit is contained in:
parent
8c48341169
commit
bfcf4b2f69
|
@ -191,31 +191,30 @@ class BarbicanKeyManager(key_manager.KeyManager):
|
||||||
raise exception.Forbidden(reason=msg)
|
raise exception.Forbidden(reason=msg)
|
||||||
|
|
||||||
def _get_barbican_endpoint(self, auth, sess):
|
def _get_barbican_endpoint(self, auth, sess):
|
||||||
barbican = self.conf.barbican
|
if self.conf.barbican.barbican_endpoint:
|
||||||
if barbican.barbican_endpoint:
|
return self.conf.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,
|
interface=self.conf.barbican.barbican_endpoint_type,
|
||||||
region_name=barbican.barbican_region_name)
|
region_name=self.conf.barbican.barbican_region_name)
|
||||||
return endpoint_data.url
|
return endpoint_data.url
|
||||||
else:
|
else:
|
||||||
service_parameters = {'service_type': 'key-manager',
|
return auth.get_endpoint(
|
||||||
'interface': barbican.barbican_endpoint_type,
|
sess,
|
||||||
'region_name': barbican.barbican_region_name}
|
service_type='key-manager',
|
||||||
return auth.get_endpoint(sess, **service_parameters)
|
interface=self.conf.barbican.barbican_endpoint_type,
|
||||||
|
region_name=self.conf.barbican.barbican_region_name)
|
||||||
|
|
||||||
def _create_base_url(self, auth, sess, endpoint):
|
def _create_base_url(self, auth, sess, endpoint):
|
||||||
barbican = self.conf.barbican
|
|
||||||
api_version = None
|
api_version = None
|
||||||
if barbican.barbican_api_version:
|
if self.conf.barbican.barbican_api_version:
|
||||||
api_version = barbican.barbican_api_version
|
api_version = self.conf.barbican.barbican_api_version
|
||||||
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,
|
interface=self.conf.barbican.barbican_endpoint_type,
|
||||||
region_name=barbican.barbican_region_name)
|
region_name=self.conf.barbican.barbican_region_name)
|
||||||
api_version = endpoint_data.api_version
|
api_version = endpoint_data.api_version
|
||||||
elif getattr(auth, 'get_discovery', None):
|
elif getattr(auth, 'get_discovery', None):
|
||||||
discovery = auth.get_discovery(sess, url=endpoint)
|
discovery = auth.get_discovery(sess, url=endpoint)
|
||||||
|
|
Loading…
Reference in New Issue