openstack/deb-horizon
Code Issues Proposed changes

Merge "Pass the project domain ID to novaclient" into stable/ocata

Browse Source
This commit is contained in:
Jenkins 2017-02-03 08:17:29 +00:00 committed by Gerrit Code Review
commit 100f77d895
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openstack_dashboard/api/nova.py
View File

@ -457,6 +457,7 @@ def get_auth_params_from_request(request):
request.user.username, request.user.username,
request.user.token.id, request.user.token.id,
request.user.tenant_id, request.user.tenant_id,
request.user.token.project.get('domain_id'),
base.url_for(request, 'compute'), base.url_for(request, 'compute'),
base.url_for(request, 'identity') base.url_for(request, 'identity')
) )
@ -464,13 +465,21 @@ def get_auth_params_from_request(request):
@memoized_with_request(get_auth_params_from_request) @memoized_with_request(get_auth_params_from_request)
def novaclient(request_auth_params, version=None): def novaclient(request_auth_params, version=None):
username, token_id, project_id, nova_url, auth_url = request_auth_params (
username,
token_id,
project_id,
project_domain_id,
nova_url,
auth_url
) = request_auth_params
if version is None: if version is None:
version = VERSIONS.get_active_version()['version'] version = VERSIONS.get_active_version()['version']
c = nova_client.Client(version, c = nova_client.Client(version,
username, username,
token_id, token_id,
project_id=project_id, project_id=project_id,
project_domain_id=project_domain_id,
auth_url=auth_url, auth_url=auth_url,
insecure=INSECURE, insecure=INSECURE,
cacert=CACERT, cacert=CACERT,