x/tuskar-ui
Code Issues Proposed changes

fix log-in

Browse Source
This commit is contained in:
Anthony Young
2011-07-18 10:59:13 -07:00
parent 093fe4f74f
commit 8e39b0a4b1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
django-openstack/django_openstack/api.py
View File

@@ -467,7 +467,7 @@ def token_info(request, token):
"X_AUTH_TOKEN": settings.OPENSTACK_ADMIN_TOKEN,
"Accept": "text/json"}
o = urlparse(token.serviceCatalog['identity'][0]['adminURL'])
o = urlparse(token.serviceCatalog['keystone'][0]['adminURL'])
conn = httplib.HTTPConnection(o.hostname, o.port)
conn.request("GET", "/v2.0/tokens/%s" % token.id, headers=hdrs)
response = conn.getresponse()

2
django-openstack/django_openstack/middleware/keystone.py
View File

@@ -42,7 +42,7 @@ class User(object):
def get_user_from_request(request):
if 'user' not in request.session:
return User(None,None,None,None)
return User(None,None,None,None,None)
return User(request.session['token'],
request.session['user'],
request.session['tenant'],