summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorTodd Willey <todd@ansolabs.com>2011-01-04 18:01:29 -0500
committerTodd Willey <todd@ansolabs.com>2011-01-04 18:01:29 -0500
commitf55dbc2f599ed56fb59c7f7a94cd81d3fd82c8dd (patch)
tree141f70dab295b25d4c5d881cbd9b13a905f9a4e7 /etc
parentdd1e36b9690a2c2de18c565c496b25295a13d0aa (diff)
downloadnova-f55dbc2f599ed56fb59c7f7a94cd81d3fd82c8dd.tar.gz
nova-f55dbc2f599ed56fb59c7f7a94cd81d3fd82c8dd.tar.xz
nova-f55dbc2f599ed56fb59c7f7a94cd81d3fd82c8dd.zip
Rework how routing is done in ec2 endpoint.
Diffstat (limited to 'etc')
-rw-r--r--etc/nova-api.conf19
1 files changed, 14 insertions, 5 deletions
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