summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-01-26 10:19:30 +0000
committerGerrit Code Review <review@openstack.org>2015-01-26 10:19:30 +0000
commit2079383083b691c37726083fbc70a2d1f64666c8 (patch)
treeaed9c0535ab3d7c2a0555b6b19763f0074c26c47
parentf22e0bba7e2787b929bbf715f576bb4011f287fc (diff)
parent2cfe275a61125329badd6dc150a23148292afca0 (diff)
downloaddjango_openstack_auth-2079383083b691c37726083fbc70a2d1f64666c8.tar.gz
Merge "Add defaulting of services_region in User class"1.1.9
-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 42b1071..57bae3f 100644
--- a/openstack_auth/user.py
+++ b/openstack_auth/user.py
@@ -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