openstack/horizon
Code Issues Proposed changes

Merge "enabling trove to work in multi-region deployment"

Browse Source
This commit is contained in:
Jenkins 2013-10-01 10:40:42 +00:00 committed by Gerrit Code Review
commit 7c16957082
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openstack_dashboard/api/trove.py
View File

@ -33,6 +33,7 @@ class TokenAuth(object):
self.username = username self.username = username
self.service_type = service_type self.service_type = service_type
self.service_name = service_name self.service_name = service_name
self.region = region
def authenticate(self): def authenticate(self):
catalog = { catalog = {
@ -47,7 +48,8 @@ class TokenAuth(object):
return None return None
return auth.ServiceCatalog(catalog, return auth.ServiceCatalog(catalog,
service_type=self.service_type, service_type=self.service_type,
service_name=self.service_name) service_name=self.service_name,
region=self.region)
def troveclient(request): def troveclient(request):
@ -55,7 +57,8 @@ def troveclient(request):
return None return None
return client.Dbaas(username=request.user, return client.Dbaas(username=request.user,
api_key=None, api_key=None,
auth_strategy=TokenAuth) auth_strategy=TokenAuth,
region_name=request.user.services_region)
def instance_list(request, marker=None): def instance_list(request, marker=None):