summaryrefslogtreecommitdiffstats
path: root/etc/api-paste.ini
diff options
context:
space:
mode:
authorBrian Waldon <brian.waldon@rackspace.com>2011-03-24 12:21:46 -0400
committerBrian Waldon <brian.waldon@rackspace.com>2011-03-24 12:21:46 -0400
commitab6b3cbc8e6addb00b17601eb1bae47b429d273f (patch)
tree667c0221f98f89179e18f6e5c08e047eff1e7adb /etc/api-paste.ini
parent1abd4e6d592fb41d86fa32c3f77fd0e0a43ca5d3 (diff)
parentc53e56576ead57815f3542a7faa797e5d0135e0c (diff)
merged trunk r864
Diffstat (limited to 'etc/api-paste.ini')
-rw-r--r--etc/api-paste.ini18
1 files changed, 12 insertions, 6 deletions
diff --git a/etc/api-paste.ini b/etc/api-paste.ini
index d95350fc7..169163289 100644
--- a/etc/api-paste.ini
+++ b/etc/api-paste.ini
@@ -67,11 +67,14 @@ paste.app_factory = nova.api.ec2.metadatarequesthandler:MetadataRequestHandler.f
[composite:osapi]
use = egg:Paste#urlmap
/: osversions
-/v1.0: openstackapi
-/v1.1: openstackapi
+/v1.0: openstackapi10
+/v1.1: openstackapi11
-[pipeline:openstackapi]
-pipeline = faultwrap auth ratelimit osapiapp
+[pipeline:openstackapi10]
+pipeline = faultwrap auth ratelimit osapiapp10
+
+[pipeline:openstackapi11]
+pipeline = faultwrap auth ratelimit osapiapp11
[filter:faultwrap]
paste.filter_factory = nova.api.openstack:FaultWrapper.factory
@@ -82,8 +85,11 @@ paste.filter_factory = nova.api.openstack.auth:AuthMiddleware.factory
[filter:ratelimit]
paste.filter_factory = nova.api.openstack.limits:RateLimitingMiddleware.factory
-[app:osapiapp]
-paste.app_factory = nova.api.openstack:APIRouter.factory
+[app:osapiapp10]
+paste.app_factory = nova.api.openstack:APIRouterV10.factory
+
+[app:osapiapp11]
+paste.app_factory = nova.api.openstack:APIRouterV11.factory
[pipeline:osversions]
pipeline = faultwrap osversionapp