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 | ce6571fe64189c2206577d0e40ef8764d44d1378 (patch) | |
| tree | 4316c8af89807304de975275892cba0086f18082 /openstack | |
| parent | cb82d356e6e49e9e60b933de85cea583dc46cd72 (diff) | |
| parent | ab50ac0c9b8e9dbf2a2f353f68c2b7f397175df2 (diff) | |
| download | oslo-ce6571fe64189c2206577d0e40ef8764d44d1378.tar.gz oslo-ce6571fe64189c2206577d0e40ef8764d44d1378.tar.xz oslo-ce6571fe64189c2206577d0e40ef8764d44d1378.zip | |
Merge "Fix inconsistency with auth_tok/auth_token"
Diffstat (limited to 'openstack')
| -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} |