diff options
author | Jenkins <jenkins@review.openstack.org> | 2013-03-11 06:41:28 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-03-11 06:41:28 +0000 |
commit | 2d0f41b6532bb0bbb903554906f9872cb218d90f (patch) | |
tree | 8e0f4c2dffa966e1aa9e538a8e28241f7eab6581 | |
parent | 224ce632e9e519bae109ba51e17fe0754558e0f5 (diff) | |
parent | 946b704adda8b8bab048b7e69655958db8a5c5eb (diff) | |
download | oslo-context-2d0f41b6532bb0bbb903554906f9872cb218d90f.tar.gz |
Merge "Fix inconsistency with auth_tok/auth_token"
-rw-r--r-- | openstack/common/context.py | 6 |
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} |