diff options
| author | Brian Lamar <brian.lamar@rackspace.com> | 2011-03-24 13:53:54 -0400 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2011-03-24 13:53:54 -0400 |
| commit | e81622a6f878f758dc1c17b3a092eccbfef4881c (patch) | |
| tree | 22f6170863d0600c3565c35bbd2e080cd873252e /etc/api-paste.ini | |
| parent | bec2215dcec1af5e30393a8e2970a9a949856c7c (diff) | |
| parent | b45f4c2f8b5537b758dad7d62dc73e7be216f516 (diff) | |
Merged trunk and resolved conflict in nova/db/sqlalchemy/api.py
Diffstat (limited to 'etc/api-paste.ini')
| -rw-r--r-- | etc/api-paste.ini | 18 |
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 |