summaryrefslogtreecommitdiffstats
path: root/etc/api-paste.ini
diff options
context:
space:
mode:
authorCory Wright <cory.wright@rackspace.com>2011-03-25 15:10:56 +0000
committerCory Wright <cory.wright@rackspace.com>2011-03-25 15:10:56 +0000
commit4c510d588d4a67a549f5a544f7fa64f97c0022c7 (patch)
treea1d02c453b31af713cfad4bad85d47bd29f07cb0 /etc/api-paste.ini
parent4183eabb7ca46735ab6b87b1469ff089c4f19cb4 (diff)
parent162af7b79631b151f03bb46773a1448e6c051325 (diff)
merge trunk
Diffstat (limited to 'etc/api-paste.ini')
-rw-r--r--etc/api-paste.ini21
1 files changed, 15 insertions, 6 deletions
diff --git a/etc/api-paste.ini b/etc/api-paste.ini
index d95350fc7..35d4a8391 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 extensions osapiapp11
[filter:faultwrap]
paste.filter_factory = nova.api.openstack:FaultWrapper.factory
@@ -82,8 +85,14 @@ 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
+[filter:extensions]
+paste.filter_factory = nova.api.openstack.extensions:ExtensionMiddleware.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