diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-07-16 12:16:24 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-07-16 12:16:24 +0000 |
commit | 95670fc268c27bbb8cdb1770c19a10f446ae263c (patch) | |
tree | 08b2f7ffdfb01da1260b6289b03fa924ca29cf7b | |
parent | bacb0453def2297fb9c733d36a84154feb42ccf5 (diff) | |
parent | d19c032abf932a6afc49423dc096fa8238e62687 (diff) | |
download | django_openstack_auth-95670fc268c27bbb8cdb1770c19a10f446ae263c.tar.gz |
Merge "Set default value for new token attributes" into stable/kilo
-rw-r--r-- | openstack_auth/user.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/openstack_auth/user.py b/openstack_auth/user.py index 811fe84..132e37b 100644 --- a/openstack_auth/user.py +++ b/openstack_auth/user.py @@ -55,8 +55,9 @@ def create_user_from_token(request, token, endpoint, services_region=None): roles=token.roles, endpoint=endpoint, services_region=svc_region, - is_federated=token.is_federated, - unscoped_token=token.unscoped_token) + is_federated=getattr(token, 'is_federated', False), + unscoped_token=getattr(token, 'unscoped_token', + request.session.get('unscoped_token'))) class Token(object): |