diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-16 23:35:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-16 23:35:08 +0000 |
| commit | 36dcc2d9230f8104f0defc8fa27ee8f6c2f2eeaf (patch) | |
| tree | b6fb06617cbcfbf985b7186a4e430b5f6cd75500 /etc | |
| parent | 381e5e5b0dbbb6fefdc8194fa103176f18760060 (diff) | |
| parent | e6073532e5020203a8ec2247ca7ddd481c6ec517 (diff) | |
Merge "Separate metadata api into its own service"
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/nova/api-paste.ini | 50 |
1 files changed, 28 insertions, 22 deletions
diff --git a/etc/nova/api-paste.ini b/etc/nova/api-paste.ini index af175990f..580191c01 100644 --- a/etc/nova/api-paste.ini +++ b/etc/nova/api-paste.ini @@ -1,21 +1,39 @@ +############ +# Metadata # +############ +[composite:metadata] +use = egg:Paste#urlmap +/: metaversions +/latest: meta +/2007-01-19: meta +/2007-03-01: meta +/2007-08-29: meta +/2007-10-10: meta +/2007-12-15: meta +/2008-02-01: meta +/2008-09-01: meta +/2009-04-04: meta + +[pipeline:metaversions] +pipeline = ec2faultwrap logrequest metaverapp + +[pipeline:meta] +pipeline = ec2faultwrap logrequest metaapp + +[app:metaverapp] +paste.app_factory = nova.api.metadata.handler:Versions.factory + +[app:metaapp] +paste.app_factory = nova.api.metadata.handler:MetadataRequestHandler.factory + ####### # EC2 # ####### [composite:ec2] use = egg:Paste#urlmap -/: ec2versions /services/Cloud: ec2cloud /services/Admin: ec2admin -/latest: ec2metadata -/2007-01-19: ec2metadata -/2007-03-01: ec2metadata -/2007-08-29: ec2metadata -/2007-10-10: ec2metadata -/2007-12-15: ec2metadata -/2008-02-01: ec2metadata -/2008-09-01: ec2metadata -/2009-04-04: ec2metadata [pipeline:ec2cloud] pipeline = ec2faultwrap logrequest ec2noauth cloudrequest authorizer ec2executor @@ -27,12 +45,6 @@ pipeline = ec2faultwrap logrequest ec2noauth adminrequest authorizer ec2executor # NOTE(vish): use the following pipeline for deprecated auth #pipeline = ec2faultwrap logrequest authenticate adminrequest authorizer ec2executor -[pipeline:ec2metadata] -pipeline = ec2faultwrap logrequest ec2md - -[pipeline:ec2versions] -pipeline = ec2faultwrap logrequest ec2ver - [filter:ec2faultwrap] paste.filter_factory = nova.api.ec2:FaultWrapper.factory @@ -62,12 +74,6 @@ paste.filter_factory = nova.api.ec2:Authorizer.factory [app:ec2executor] paste.app_factory = nova.api.ec2:Executor.factory -[app:ec2ver] -paste.app_factory = nova.api.ec2:Versions.factory - -[app:ec2md] -paste.app_factory = nova.api.ec2.metadatarequesthandler:MetadataRequestHandler.factory - ############# # Openstack # ############# |