openstack/manila
Code Issues Proposed changes

Add option to select keystone endpoint interface

Browse Source 
... used to manage application credentials. By default the client
uses public endpoint obtained from the service catalog, regardless
of the auth_url value set.

Change-Id: Id086284c90bb069ec94d7b9cfed0fb9983a57669
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-12 20:20:29 +09:00
parent da85a864b8
commit c406736dae
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
manila/keymgr/barbican.py
View File

@@ -38,6 +38,11 @@ ks_loading.register_auth_conf_options(CONF, BARBICAN_GROUP)
BARBICAN_OPTS = [
cfg.StrOpt('endpoint_type',
default='publicURL',
choices=['publicURL', 'internalURL', 'adminURL',
'public', 'internal', 'admin'],
help='Endpoint type to be used with keystone client calls.'),
cfg.StrOpt('region_name',
help='Region name for connecting to keystone for '
'application credential management.'),
@@ -97,6 +102,7 @@ class BarbicanSecretACL(barbican_key_manager.BarbicanKeyManager):
barbican_sess = ks_session.Session(auth=barbican_auth)
barbican_ks_client = ks_client.Client(
session=barbican_sess,
interface=self.conf.barbican.endpoint_type,
region_name=self.conf.barbican.region_name)
return barbican_ks_client.session.get_user_id()
@@ -155,7 +161,9 @@ class BarbicanUserAppCreds(object):
BARBICAN_GROUP)
sess = ks_session.Session(auth=auth)
return ks_client.Client(
session=sess, region_name=self.conf.barbican.region_name)
session=sess,
interface=self.conf.barbican.endpoint_type,
region_name=self.conf.barbican.region_name)
def get_application_credentials(self, context, application_credential_id):
if not application_credential_id: