diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-01 19:08:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-01 19:08:03 +0000 |
| commit | fced0f58bcbaef6fff76c6719e27e7d100aa721b (patch) | |
| tree | 38914db032abbb1df4d3fc696b0a223c247f40be /etc/nova | |
| parent | b3b3194d76e22cb9617750c7b13c3a1d4429a636 (diff) | |
| parent | 62d5fae8d11b6403f9a63a709270ffafebb7ef09 (diff) | |
Merge "remove unsupported ec2 extensions"
Diffstat (limited to 'etc/nova')
| -rw-r--r-- | etc/nova/api-paste.ini | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/etc/nova/api-paste.ini b/etc/nova/api-paste.ini index 237086407..496f4f5d2 100644 --- a/etc/nova/api-paste.ini +++ b/etc/nova/api-paste.ini @@ -33,7 +33,6 @@ paste.app_factory = nova.api.metadata.handler:MetadataRequestHandler.factory [composite:ec2] use = egg:Paste#urlmap /services/Cloud: ec2cloud -/services/Admin: ec2admin [pipeline:ec2cloud] pipeline = ec2faultwrap logrequest ec2noauth cloudrequest authorizer validator ec2executor @@ -42,13 +41,6 @@ pipeline = ec2faultwrap logrequest ec2noauth cloudrequest authorizer validator e # NOTE(vish): use the following pipeline for keystone auth # pipeline = ec2faultwrap logrequest totoken authtoken keystonecontext cloudrequest authorizer validator ec2executor -[pipeline:ec2admin] -pipeline = ec2faultwrap logrequest ec2noauth adminrequest authorizer ec2executor -# NOTE(vish): use the following pipeline for deprecated auth -# pipeline = ec2faultwrap logrequest authenticate adminrequest authorizer ec2executor -# NOTE(vish): use the following pipeline for keystone auth -# pipeline = ec2faultwrap logrequest totoken authtoken keystonecontext adminrequest authorizer ec2executor - [filter:ec2faultwrap] paste.filter_factory = nova.api.ec2:FaultWrapper.factory @@ -71,10 +63,6 @@ paste.filter_factory = nova.api.ec2:Authenticate.factory controller = nova.api.ec2.cloud.CloudController paste.filter_factory = nova.api.ec2:Requestify.factory -[filter:adminrequest] -controller = nova.api.ec2.admin.AdminController -paste.filter_factory = nova.api.ec2:Requestify.factory - [filter:authorizer] paste.filter_factory = nova.api.ec2:Authorizer.factory |