summaryrefslogtreecommitdiffstats
path: root/openstack
diff options
context:
space:
mode:
authorDavanum Srinivas <dims@linux.vnet.ibm.com>2013-03-10 19:04:42 -0400
committerDavanum Srinivas <dims@linux.vnet.ibm.com>2013-03-10 19:04:42 -0400
commitab50ac0c9b8e9dbf2a2f353f68c2b7f397175df2 (patch)
treedab3b95555e80f43a5f6db7303909bea39d8bc28 /openstack
parent622f79311787c8a0b02d4999ada66810a97246e0 (diff)
downloadoslo-ab50ac0c9b8e9dbf2a2f353f68c2b7f397175df2.tar.gz
oslo-ab50ac0c9b8e9dbf2a2f353f68c2b7f397175df2.tar.xz
oslo-ab50ac0c9b8e9dbf2a2f353f68c2b7f397175df2.zip
Fix inconsistency with auth_tok/auth_token
Switch to using auth_token instead of auth_ok Fixes LP# 1152826 Change-Id: I56569c1fa8f29b0474440c40644729d436d41c7b
Diffstat (limited to 'openstack')
-rw-r--r--openstack/common/context.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/openstack/common/context.py b/openstack/common/context.py
index dd7dd04..442ab1d 100644
--- a/openstack/common/context.py
+++ b/openstack/common/context.py
@@ -37,9 +37,9 @@ class RequestContext(object):
accesses the system, as well as additional request information.
"""
- def __init__(self, auth_tok=None, user=None, tenant=None, is_admin=False,
+ def __init__(self, auth_token=None, user=None, tenant=None, is_admin=False,
read_only=False, show_deleted=False, request_id=None):
- self.auth_tok = auth_tok
+ self.auth_token = auth_token
self.user = user
self.tenant = tenant
self.is_admin = is_admin
@@ -55,7 +55,7 @@ class RequestContext(object):
'is_admin': self.is_admin,
'read_only': self.read_only,
'show_deleted': self.show_deleted,
- 'auth_token': self.auth_tok,
+ 'auth_token': self.auth_token,
'request_id': self.request_id}