summaryrefslogtreecommitdiffstats
path: root/etc/api-paste.ini
diff options
context:
space:
mode:
authorJustin Santa Barbara <justin@fathomdb.com>2011-03-25 14:59:01 -0700
committerJustin Santa Barbara <justin@fathomdb.com>2011-03-25 14:59:01 -0700
commit2d07440385f18e08cbf833f11a7d356ba430fabc (patch)
tree0983b8bc17a81f1070933733b32baa0b4206285d /etc/api-paste.ini
parentd98b212ebb49990fbe053be5f45014d3466589ce (diff)
parented12a2cd2beef77d1c7e9d16771e766aa068530d (diff)
Merged with trunk, resolved conflicts & code-flicts
Diffstat (limited to 'etc/api-paste.ini')
-rw-r--r--etc/api-paste.ini7
1 files changed, 5 insertions, 2 deletions
diff --git a/etc/api-paste.ini b/etc/api-paste.ini
index 169163289..abe8c20c4 100644
--- a/etc/api-paste.ini
+++ b/etc/api-paste.ini
@@ -74,7 +74,7 @@ use = egg:Paste#urlmap
pipeline = faultwrap auth ratelimit osapiapp10
[pipeline:openstackapi11]
-pipeline = faultwrap auth ratelimit osapiapp11
+pipeline = faultwrap auth ratelimit extensions osapiapp11
[filter:faultwrap]
paste.filter_factory = nova.api.openstack:FaultWrapper.factory
@@ -85,6 +85,9 @@ paste.filter_factory = nova.api.openstack.auth:AuthMiddleware.factory
[filter:ratelimit]
paste.filter_factory = nova.api.openstack.limits:RateLimitingMiddleware.factory
+[filter:extensions]
+paste.filter_factory = nova.api.openstack.extensions:ExtensionMiddleware.factory
+
[app:osapiapp10]
paste.app_factory = nova.api.openstack:APIRouterV10.factory
@@ -95,4 +98,4 @@ paste.app_factory = nova.api.openstack:APIRouterV11.factory
pipeline = faultwrap osversionapp
[app:osversionapp]
-paste.app_factory = nova.api.openstack:Versions.factory
+paste.app_factory = nova.api.openstack.versions:Versions.factory