From 2cfe275a61125329badd6dc150a23148292afca0 Mon Sep 17 00:00:00 2001 From: lin-hua-cheng Date: Fri, 23 Jan 2015 18:00:14 -0800 Subject: [PATCH] Add defaulting of services_region in User class Defaulting of the services_region in the User class was removed in commit 4ceb57d02b8bbed30578a8052a31b982a1339f41 The change resulted to horizon tests failing, this patch restores the old behavior of the User class to default the services_region. Change-Id: If6ead2d8da9d8963ae23fc5c8e2335ae8f12773f Closes-Bug: 1413876 --- openstack_auth/user.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openstack_auth/user.py b/openstack_auth/user.py index 42b1071f..57bae3fc 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