From f55dbc2f599ed56fb59c7f7a94cd81d3fd82c8dd Mon Sep 17 00:00:00 2001 From: Todd Willey Date: Tue, 4 Jan 2011 18:01:29 -0500 Subject: Rework how routing is done in ec2 endpoint. --- etc/nova-api.conf | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'etc') diff --git a/etc/nova-api.conf b/etc/nova-api.conf index c5dd0aaec..cf49b7254 100644 --- a/etc/nova-api.conf +++ b/etc/nova-api.conf @@ -12,19 +12,28 @@ openstack_address = 0.0.0.0 [composite:ec2] use = egg:Paste#urlmap /: ec2versions -/services: ec2api +/services/Cloud: ec2cloud +/services/Admin: ec2admin /latest: ec2metadata /200: ec2metadata /1.0: ec2metadata -[pipeline:ec2api] -pipeline = authenticate router authorizer ec2executor +[pipeline:ec2cloud] +pipeline = authenticate cloudrequest authorizer ec2executor + +[pipeline:ec2admin] +pipeline = authenticate adminrequest authorizer ec2executor [filter:authenticate] paste.filter_factory = nova.api.ec2:authenticate_factory -[filter:router] -paste.filter_factory = nova.api.ec2:router_factory +[filter:cloudrequest] +controller = nova.api.ec2.cloud.CloudController +paste.filter_factory = nova.api.ec2:requestify_factory + +[filter:adminrequest] +controller = nova.api.ec2.admin.AdminController +paste.filter_factory = nova.api.ec2:requestify_factory [filter:authorizer] paste.filter_factory = nova.api.ec2:authorizer_factory -- cgit