diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-03-28 13:43:17 -0500 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-03-28 13:43:17 -0500 |
| commit | 14718afef1cc79b4d41f490be677caf3e4191e2b (patch) | |
| tree | 6d956420231f2bbbb0fc209753edc78e15cd9434 /etc | |
| parent | cff74a76e6369989e8006aa9d7c20fde14b31952 (diff) | |
| parent | c3c86f994413792cf582df86cf5e16f788005bed (diff) | |
| download | nova-14718afef1cc79b4d41f490be677caf3e4191e2b.tar.gz nova-14718afef1cc79b4d41f490be677caf3e4191e2b.tar.xz nova-14718afef1cc79b4d41f490be677caf3e4191e2b.zip | |
Merge from trunk and resolving conflicts
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/api-paste.ini (renamed from etc/nova-api.conf) | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/etc/nova-api.conf b/etc/api-paste.ini index 9f7e93d4c..abe8c20c4 100644 --- a/etc/nova-api.conf +++ b/etc/api-paste.ini @@ -67,10 +67,14 @@ paste.app_factory = nova.api.ec2.metadatarequesthandler:MetadataRequestHandler.f [composite:osapi] use = egg:Paste#urlmap /: osversions -/v1.0: 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 @@ -79,13 +83,19 @@ paste.filter_factory = nova.api.openstack:FaultWrapper.factory paste.filter_factory = nova.api.openstack.auth:AuthMiddleware.factory [filter:ratelimit] -paste.filter_factory = nova.api.openstack.ratelimiting:RateLimitingMiddleware.factory +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 -[app:osapiapp] -paste.app_factory = nova.api.openstack:APIRouter.factory +[app:osapiapp11] +paste.app_factory = nova.api.openstack:APIRouterV11.factory [pipeline:osversions] pipeline = faultwrap osversionapp [app:osversionapp] -paste.app_factory = nova.api.openstack:Versions.factory +paste.app_factory = nova.api.openstack.versions:Versions.factory |