From 2491c2484f025cb3f061fcc6a5c6915006feb47b Mon Sep 17 00:00:00 2001 From: Todd Willey Date: Tue, 4 Jan 2011 18:16:16 -0500 Subject: Make paste the default api pattern. * get rid of the --use_lockout flag since it will be specified in paste config (Example line is commented out in etc/nova-api.conf, factory is in place) * remove old nova-api binary and promote nova-api-paste * change how we store ec2 parameters to bin the the ApiRequest * get rid of Router, since paste.urlmap is equally effective (Requestify now gets passed the name of the controller requests are to.) --- etc/nova-api.conf | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'etc') diff --git a/etc/nova-api.conf b/etc/nova-api.conf index cf49b7254..dcb4e7894 100644 --- a/etc/nova-api.conf +++ b/etc/nova-api.conf @@ -20,10 +20,14 @@ use = egg:Paste#urlmap [pipeline:ec2cloud] pipeline = authenticate cloudrequest authorizer ec2executor +#pipeline = ec2lockout authenticate cloudrequest authorizer ec2executor [pipeline:ec2admin] pipeline = authenticate adminrequest authorizer ec2executor +[filter:ec2lockout] +paste.filter_factory = nova.api.ec2:lockout_factory + [filter:authenticate] paste.filter_factory = nova.api.ec2:authenticate_factory -- cgit