Remove nova-specific middlewares

* Nova now ships with nova.api.auth.NovaKeystoneContext
* Nova does not depend on either of the middlewares being removed

Change-Id: I9546e5c84ea1453f5dfd2dd7bf9924ccda57f87a

2 files changed, 1 insertions, 153 deletions

diff --git a/doc/source/configuringservices.rst b/doc/source/configuringservices.rst
index 2d53791e..0faa00ca 100644
--- a/doc/source/configuringservices.rst
+++ b/doc/source/configuringservices.rst
@@ -21,7 +21,6 @@ Configuring Services to work with Keystone
 .. toctree::
    :maxdepth: 1
 
-    nova-api-paste
     middleware_architecture
 
 Once Keystone is installed and running (see :doc:`configuration`), services
@@ -112,17 +111,9 @@ the WSGI pipeline to handle authenticating tokens with Keystone.
 Configuring Nova to use Keystone
 --------------------------------
 
-To configure Nova to use Keystone for authentication, the Nova API service
-can be run against the api-paste file provided by Keystone. This is most
-easily accomplished by setting the `--api_paste_config` flag in nova.conf to
-point to `examples/paste/nova-api-paste.ini` from Keystone. This paste file
-included references to the WSGI authentication middleware provided with the
-keystone installation.
-
 When configuring Nova, it is important to create a admin service token for
 the service (from the Configuration step above) and include that as the key
-'admin_token' in the nova-api-paste.ini. See the documented
-:doc:`nova-api-paste` file for references.
+'admin_token' in Nova's api-paste.ini.
 
 Configuring Swift to use Keystone
 ---------------------------------
diff --git a/doc/source/nova-api-paste.rst b/doc/source/nova-api-paste.rst
deleted file mode 100644
index d6567144..00000000
--- a/doc/source/nova-api-paste.rst
+++ /dev/null
@@ -1,143 +0,0 @@
-..
-      Copyright 2011-2012 OpenStack, LLC
-      All Rights Reserved.
-
-      Licensed under the Apache License, Version 2.0 (the "License"); you may
-      not use this file except in compliance with the License. You may obtain
-      a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-      License for the specific language governing permissions and limitations
-      under the License.
-
-nova-api-paste example
-======================
-::
-
-    #######
-    # 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
-    /1.0: ec2metadata
-
-    [pipeline:ec2cloud]
-    pipeline = logrequest totoken authtoken keystonecontext cloudrequest authorizer ec2executor
-
-    [pipeline:ec2admin]
-    pipeline = logrequest totoken authtoken keystonecontext adminrequest authorizer ec2executor
-
-    [pipeline:ec2metadata]
-    pipeline = logrequest ec2md
-
-    [pipeline:ec2versions]
-    pipeline = logrequest ec2ver
-
-    [filter:logrequest]
-    paste.filter_factory = nova.api.ec2:RequestLogging.factory
-
-    [filter:ec2lockout]
-    paste.filter_factory = nova.api.ec2:Lockout.factory
-
-    [filter:totoken]
-    paste.filter_factory = keystone.middleware.ec2_token:EC2Token.factory
-
-    [filter:ec2noauth]
-    paste.filter_factory = nova.api.ec2:NoAuth.factory
-
-    [filter:authenticate]
-    paste.filter_factory = nova.api.ec2:Authenticate.factory
-
-    [filter:cloudrequest]
-    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
-
-    [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 #
-    #############
-
-    [composite:osapi]
-    use = egg:Paste#urlmap
-    /: osversions
-    /v1.1: openstackapi
-
-    [pipeline:openstackapi]
-    pipeline = faultwrap authtoken keystonecontext ratelimit extensions osapiapp
-
-    [filter:faultwrap]
-    paste.filter_factory = nova.api.openstack:FaultWrapper.factory
-
-    [filter:auth]
-    paste.filter_factory = nova.api.openstack.auth:AuthMiddleware.factory
-
-    [filter:noauth]
-    paste.filter_factory = nova.api.openstack.auth:NoAuthMiddleware.factory
-
-    [filter:ratelimit]
-    paste.filter_factory = nova.api.openstack.limits:RateLimitingMiddleware.factory
-
-    [filter:extensions]
-    paste.filter_factory = nova.api.openstack.extensions:ExtensionMiddleware.factory
-
-    [app:osapiapp]
-    paste.app_factory = nova.api.openstack:APIRouter.factory
-
-    [pipeline:osversions]
-    pipeline = faultwrap osversionapp
-
-    [app:osversionapp]
-    paste.app_factory = nova.api.openstack.versions:Versions.factory
-
-    ##########
-    # Shared #
-    ##########
-
-    [filter:keystonecontext]
-    paste.filter_factory = keystone.middleware.nova_keystone_context:NovaKeystoneContext.factory
-
-    [filter:authtoken]
-    paste.filter_factory = keystone.middleware.auth_token:filter_factory
-    service_protocol = http
-    service_host = 127.0.0.1
-    service_port = 5000
-    auth_host = 127.0.0.1
-    auth_port = 35357
-    auth_protocol = http
-    auth_uri = http://your_keystone_host.com:5000/
-    ;identical to the admin token defined in keystone.conf
-    admin_token = 999888777666
-    ;Uncomment next line and check ip:port to use memcached to cache token requests
-    ;memcache_servers = 127.0.0.1:11211