summaryrefslogtreecommitdiff
path: root/openstack_auth/user.py
diff options
context:
space:
mode:
Diffstat (limited to 'openstack_auth/user.py')
-rw-r--r--openstack_auth/user.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/openstack_auth/user.py b/openstack_auth/user.py
index 3edb204..063648b 100644
--- a/openstack_auth/user.py
+++ b/openstack_auth/user.py
@@ -43,8 +43,11 @@ def set_session_from_user(request, user):
def create_user_from_token(request, token, endpoint, services_region=None):
# if the region is provided, use that, otherwise use the preferred region
+ default_service_regions = getattr(settings, 'DEFAULT_SERVICE_REGIONS', {})
+ default_service_region = default_service_regions.get(endpoint)
svc_region = services_region or \
- utils.default_services_region(token.serviceCatalog, request)
+ utils.default_services_region(token.serviceCatalog, request,
+ selected_region=default_service_region)
return User(id=token.user['id'],
token=token,
user=token.user['name'],