openstack
/
sahara-dashboard
Code Issues Proposed changes

Merge "Pass configured endpoint type to sahara client" into stable/wallaby

This commit is contained in:
Zuul 2022-08-11 14:16:16 +00:00 committed by Gerrit Code Review
parent 065f2e4ba1 03547d5ce7
commit 0948f8d3da
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sahara_dashboard/api/sahara.py
View File

@ -95,6 +95,7 @@ def safe_call(func, *args, **kwargs):
def client(request):
insecure = getattr(settings, 'OPENSTACK_SSL_NO_VERIFY', False)
cacert = getattr(settings, 'OPENSTACK_SSL_CACERT', None)
endpoint_type = getattr(settings, 'OPENSTACK_ENDPOINT_TYPE', 'publicURL')
auth = identity.Token(auth_url=request.user.endpoint,
token=request.user.token.id,
project_id=request.user.project_id)
@ -106,7 +107,8 @@ def client(request):
sess = session.Session(auth=auth, verify=verify)
return api_client.Client(VERSIONS.get_active_version()["version"],
service_type=SAHARA_SERVICE,
session=sess)
session=sess,
endpoint_type=endpoint_type)
def prepare_acl_update_dict(is_public=None, is_protected=None):