diff options
| author | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-03-24 09:38:12 +0000 |
|---|---|---|
| committer | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-03-24 09:38:12 +0000 |
| commit | a3dee96483cb416cb1605cb6975135ea09bd12b6 (patch) | |
| tree | 5dd0e6f791e5b16773cd08199d71062a0d0f9ce6 /etc | |
| parent | f0a44da43c804d689e8174957f35dbe2f857acdc (diff) | |
| parent | 08fd7016db5b0e435b8d9728345739afcf3cb152 (diff) | |
merge trunk
Diffstat (limited to 'etc')
| -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 |