summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-15 12:12:18 +0000
committerGerrit Code Review <review@openstack.org>2017-06-15 12:12:18 +0000
commit6cca25d274b0660014f1e1866c1f91c921453b12 (patch)
treee64e93553a53a48c0106a0dbc5111a1f8e28881b
parentef571a753234207e50bf2bc3ab57770dc843f285 (diff)
parentaa1ea288c678d7d2d302700a2266a4c05be65a32 (diff)
Merge "keystone api: Fix a typo that broke the check for MULTIDOMAIN_SUPPORT" into stable/ocata
-rw-r--r--openstack_dashboard/api/keystone.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/openstack_dashboard/api/keystone.py b/openstack_dashboard/api/keystone.py
index eb80da7..6ac1f86 100644
--- a/openstack_dashboard/api/keystone.py
+++ b/openstack_dashboard/api/keystone.py
@@ -158,7 +158,7 @@ def keystoneclient(request, admin=False):
158 user = request.user 158 user = request.user
159 token_id = user.token.id 159 token_id = user.token.id
160 160
161 if is_multi_domain_enabled: 161 if is_multi_domain_enabled():
162 # Cloud Admin, Domain Admin or Mixed Domain Admin 162 # Cloud Admin, Domain Admin or Mixed Domain Admin
163 if is_domain_admin(request): 163 if is_domain_admin(request):
164 domain_token = request.session.get('domain_token') 164 domain_token = request.session.get('domain_token')