summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorJustin Santa Barbara <justin@fathomdb.com>2011-03-24 01:05:13 -0700
committerJustin Santa Barbara <justin@fathomdb.com>2011-03-24 01:05:13 -0700
commit143a8387fcbec34fd919e322a3fed7e9505c8a7c (patch)
tree347dc908b9da81008cff98310211fcef59566075 /etc
parent1894937e1ef6769a5f76c0a382931480e2547ce8 (diff)
parent86b3cc94bc672fda7925a247c3b7c2f85be2c5b5 (diff)
Merged with trunk
Diffstat (limited to 'etc')
-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