summaryrefslogtreecommitdiffstats
path: root/nova/context.py
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2012-03-05 22:35:25 -0800
committerVishvananda Ishaya <vishvananda@gmail.com>2012-03-06 12:36:10 -0800
commitba2c9cf82475a1d8e2c42da54ee9d87fc40be5c1 (patch)
treed9859ca110070160abeaeea0abf5c904091941ec /nova/context.py
parent5fb0bdd7bf807a0886261ae6cf260dc7b6425e22 (diff)
downloadnova-ba2c9cf82475a1d8e2c42da54ee9d87fc40be5c1.tar.gz
nova-ba2c9cf82475a1d8e2c42da54ee9d87fc40be5c1.tar.xz
nova-ba2c9cf82475a1d8e2c42da54ee9d87fc40be5c1.zip
Replaces pipelines with flag for auth strategy
Forcing deployers to modify a paste config file to change auth strategies is very fragile. This simplifies things by keying pipeline construction off of a single flag. Note that this will require a small change to devstack. Change-Id: I49728c356266e6084ecafb6c59542390137f89e9
Diffstat (limited to 'nova/context.py')
-rw-r--r--nova/context.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/nova/context.py b/nova/context.py
index 8ec4a30ec..f83d8fd75 100644
--- a/nova/context.py
+++ b/nova/context.py
@@ -38,8 +38,7 @@ class RequestContext(object):
def __init__(self, user_id, project_id, is_admin=None, read_deleted="no",
roles=None, remote_address=None, timestamp=None,
- request_id=None, auth_token=None, strategy='noauth',
- overwrite=True):
+ request_id=None, auth_token=None, overwrite=True):
"""
:param read_deleted: 'no' indicates deleted records are hidden, 'yes'
indicates deleted records are visible, 'only' indicates that
@@ -71,7 +70,6 @@ class RequestContext(object):
request_id = generate_request_id()
self.request_id = request_id
self.auth_token = auth_token
- self.strategy = strategy
if overwrite or not hasattr(local.store, 'context'):
local.store.context = self
@@ -84,8 +82,7 @@ class RequestContext(object):
'remote_address': self.remote_address,
'timestamp': utils.strtime(self.timestamp),
'request_id': self.request_id,
- 'auth_token': self.auth_token,
- 'strategy': self.strategy}
+ 'auth_token': self.auth_token}
@classmethod
def from_dict(cls, values):