Remove unused and deprecated auth-context filter

keystone.middleware.auth_token is now just aliased to
keystoneclient.middleware.auth_token.

Also heat_auth_token doesn't seem to exist, so this has likely
always been broken

Change-Id: I5eadd9a02e41921b39fc8b6783c22010893bb5e9

diff --git a/etc/heat/heat-api-cfn-paste.ini b/etc/heat/heat-api-cfn-paste.ini
index a15c1e3d7f80a906a03eb17f8d6fac00d65232fa..53f2932e4de19eab7c5e9ed39092019c465775e5 100644 (file)
--- a/etc/heat/heat-api-cfn-paste.ini
+++ b/etc/heat/heat-api-cfn-paste.ini
@@ -35,14 +35,6 @@ pipeline = versionnegotiation ec2authtoken authtoken context cache apicfnv1app
 [pipeline:heat-api-cfn-cachemanagement]
 pipeline = versionnegotiation ec2authtoken authtoken context cache cachemanage apicfnv1app
 
-# Use the following pipeline for keystone auth with cache management
-# i.e. in heat-api-cfn.conf:
-#   [paste_deploy]
-#   flavor = keystone+cachemanagement
-#
-[pipeline:heat-api-cfn-keystone+cachemanagement]
-pipeline = versionnegotiation ec2authtoken authtoken auth-context cache cachemanage apicfnv1app
-
 [app:apicfnv1app]
 paste.app_factory = heat.common.wsgi:app_factory
 heat.app_factory = heat.api.cfn.v1:API
@@ -82,7 +74,3 @@ auth_uri = http://127.0.0.1:5000/v2.0
 admin_tenant_name = service
 admin_user = heat
 admin_password = verybadpass
-
-[filter:auth-context]
-paste.filter_factory = heat.common.wsgi:filter_factory
-heat.filter_factory = keystone.middleware.heat_auth_token:KeystoneContextMiddleware

diff --git a/etc/heat/heat-api-cloudwatch-paste.ini b/etc/heat/heat-api-cloudwatch-paste.ini
index 23e76afa475025bad88954f33a24821536085a82..e73d831b0ed5504b22d06552e89e3b35c11287d7 100644 (file)
--- a/etc/heat/heat-api-cloudwatch-paste.ini
+++ b/etc/heat/heat-api-cloudwatch-paste.ini
@@ -35,14 +35,6 @@ pipeline = versionnegotiation ec2authtoken authtoken context cache apicwapp
 [pipeline:heat-api-cloudwatch-cachemanagement]
 pipeline = versionnegotiation ec2authtoken authtoken context cache cachemanage apicwapp
 
-# Use the following pipeline for keystone auth with cache management
-# i.e. in heat-api-cloudwatch.conf:
-#   [paste_deploy]
-#   flavor = keystone+cachemanagement
-#
-[pipeline:heat-api-cloudwatch-keystone+cachemanagement]
-pipeline = versionnegotiation ec2authtoken authtoken auth-context cache cachemanage apicwapp
-
 [app:apicwapp]
 paste.app_factory = heat.common.wsgi:app_factory
 heat.app_factory = heat.api.cloudwatch:API
@@ -82,7 +74,3 @@ auth_uri = http://127.0.0.1:5000/v2.0
 admin_tenant_name = admin
 admin_user = admin
 admin_password = verybadpass
-
-[filter:auth-context]
-paste.filter_factory = heat.common.wsgi:filter_factory
-heat.filter_factory = keystone.middleware.heat_auth_token:KeystoneContextMiddleware

diff --git a/etc/heat/heat-api-paste.ini b/etc/heat/heat-api-paste.ini
index 06465b4e2f01095bb12b17b81cae8cc65b4b937d..a3d87218628675f7e7568667e26f0bd877ed0fa0 100644 (file)
--- a/etc/heat/heat-api-paste.ini
+++ b/etc/heat/heat-api-paste.ini
@@ -43,14 +43,6 @@ pipeline = versionnegotiation authtoken context cache apiv1app
 [pipeline:heat-api-cachemanagement]
 pipeline = versionnegotiation authtoken context cache cachemanage apiv1app
 
-# Use the following pipeline for keystone auth with cache management
-# i.e. in heat-api.conf:
-#   [paste_deploy]
-#   flavor = keystone+cachemanagement
-#
-[pipeline:heat-api-keystone+cachemanagement]
-pipeline = versionnegotiation auth-context cache cachemanage apiv1app
-
 [app:apiv1app]
 paste.app_factory = heat.common.wsgi:app_factory
 heat.app_factory = heat.api.openstack.v1:API
@@ -86,9 +78,5 @@ admin_tenant_name = service
 admin_user = heat
 admin_password = verybadpass
 
-[filter:auth-context]
-paste.filter_factory = heat.common.wsgi:filter_factory
-heat.filter_factory = keystone.middleware.heat_auth_token:KeystoneContextMiddleware
-
 [filter:custombackendauth]
 paste.filter_factory = heat.common.custom_backend_auth:filter_factory