diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-07-14 21:02:42 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-07-14 21:02:42 +0000 |
commit | 8c30df2c0197ec4bfd3ee3355c62e210ef66f88e (patch) | |
tree | 98e433979a7a53d26d1f04dfeb7e00a3a3dcd65c | |
parent | 6e58b9fbc2782efa055662fe3faf3a3551f4b594 (diff) | |
parent | ac1ff6068b91bb67db0fdbe5ee9e99964237a83d (diff) | |
download | django_openstack_auth-8c30df2c0197ec4bfd3ee3355c62e210ef66f88e.tar.gz |
Merge "Adding tenant_id to policy default"
-rw-r--r-- | openstack_auth/policy.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/openstack_auth/policy.py b/openstack_auth/policy.py index ec10fbb..3047a90 100644 --- a/openstack_auth/policy.py +++ b/openstack_auth/policy.py @@ -121,6 +121,8 @@ def check(actions, request, target=None): # the service APIs will correct us if we are too permissive. if target.get('project_id') is None: target['project_id'] = user.project_id + if target.get('tenant_id') is None: + target['tenant_id'] = target['project_id'] # same for user_id if target.get('user_id') is None: target['user_id'] = user.id @@ -187,6 +189,7 @@ def _user_to_credentials(user): 'token': user.token, 'username': user.username, 'project_id': user.project_id, + 'tenant_id': user.project_id, 'project_name': user.project_name, 'domain_id': user.user_domain_id, 'is_admin': user.is_superuser, |