Merge "Add defaulting of services_region in User class"

This commit is contained in:
Jenkins 2015-01-26 10:19:30 +00:00 committed by Gerrit Code Review
commit 2079383083
1 changed files with 4 additions and 1 deletions

View File

@ -183,7 +183,10 @@ class User(models.AnonymousUser):
self.project_id = project_id or tenant_id
self.project_name = project_name or tenant_name
self.service_catalog = service_catalog
self._services_region = services_region
self._services_region = (
services_region
or utils.default_services_region(service_catalog)
)
self.roles = roles or []
self.endpoint = endpoint
self.enabled = enabled