From 1b633110926649a4751ee2f399273f5864c004c8 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Fri, 5 Apr 2013 15:55:31 +1300 Subject: [PATCH] Remove paste config for non-existant cache filters This appears to be junk DNA from glance, which has filters for caching image files. Change-Id: Id7ae29028d351dd005a61a5727bc7d40ceb0a705 --- etc/heat/heat-api-cfn-paste.ini | 32 -------------------------- etc/heat/heat-api-cloudwatch-paste.ini | 32 -------------------------- etc/heat/heat-api-paste.ini | 32 -------------------------- 3 files changed, 96 deletions(-) diff --git a/etc/heat/heat-api-cfn-paste.ini b/etc/heat/heat-api-cfn-paste.ini index 53f2932e..18625852 100644 --- a/etc/heat/heat-api-cfn-paste.ini +++ b/etc/heat/heat-api-cfn-paste.ini @@ -11,30 +11,6 @@ pipeline = versionnegotiation ec2authtoken authtoken context apicfnv1app [pipeline:heat-api-cfn-keystone] pipeline = versionnegotiation ec2authtoken authtoken context apicfnv1app -# Use the following pipeline to enable transparent caching of image files -# i.e. in heat-api-cfn.conf: -# [paste_deploy] -# flavor = caching -# -[pipeline:heat-api-cfn-caching] -pipeline = versionnegotiation ec2authtoken authtoken context cache apicfnv1app - -# Use the following pipeline for keystone auth with caching -# i.e. in heat-api-cfn.conf: -# [paste_deploy] -# flavor = keystone+caching -# -[pipeline:heat-api-cfn-keystone+caching] -pipeline = versionnegotiation ec2authtoken authtoken context cache apicfnv1app - -# Use the following pipeline to enable the Image Cache Management API -# i.e. in heat-api-cfn.conf: -# [paste_deploy] -# flavor = cachemanagement -# -[pipeline:heat-api-cfn-cachemanagement] -pipeline = versionnegotiation ec2authtoken authtoken context cache cachemanage apicfnv1app - [app:apicfnv1app] paste.app_factory = heat.common.wsgi:app_factory heat.app_factory = heat.api.cfn.v1:API @@ -43,14 +19,6 @@ heat.app_factory = heat.api.cfn.v1:API paste.filter_factory = heat.common.wsgi:filter_factory heat.filter_factory = heat.api.cfn:version_negotiation_filter -[filter:cache] -paste.filter_factory = heat.common.wsgi:filter_factory -heat.filter_factory = heat.api.middleware.cache:CacheFilter - -[filter:cachemanage] -paste.filter_factory = heat.common.wsgi:filter_factory -heat.filter_factory = heat.api.middleware.cache_manage:CacheManageFilter - [filter:context] paste.filter_factory = heat.common.context:ContextMiddleware_filter_factory diff --git a/etc/heat/heat-api-cloudwatch-paste.ini b/etc/heat/heat-api-cloudwatch-paste.ini index e73d831b..d33b7588 100644 --- a/etc/heat/heat-api-cloudwatch-paste.ini +++ b/etc/heat/heat-api-cloudwatch-paste.ini @@ -11,30 +11,6 @@ pipeline = versionnegotiation ec2authtoken authtoken context apicwapp [pipeline:heat-api-cloudwatch-keystone] pipeline = versionnegotiation ec2authtoken authtoken context apicwapp -# Use the following pipeline to enable transparent caching of image files -# i.e. in heat-api-cloudwatch.conf: -# [paste_deploy] -# flavor = caching -# -[pipeline:heat-api-cloudwatch-caching] -pipeline = versionnegotiation ec2authtoken authtoken context cache apicwapp - -# Use the following pipeline for keystone auth with caching -# i.e. in heat-api-cloudwatch.conf: -# [paste_deploy] -# flavor = keystone+caching -# -[pipeline:heat-api-cloudwatch-keystone+caching] -pipeline = versionnegotiation ec2authtoken authtoken context cache apicwapp - -# Use the following pipeline to enable the Image Cache Management API -# i.e. in heat-api-cloudwatch.conf: -# [paste_deploy] -# flavor = cachemanagement -# -[pipeline:heat-api-cloudwatch-cachemanagement] -pipeline = versionnegotiation ec2authtoken authtoken context cache cachemanage apicwapp - [app:apicwapp] paste.app_factory = heat.common.wsgi:app_factory heat.app_factory = heat.api.cloudwatch:API @@ -43,14 +19,6 @@ heat.app_factory = heat.api.cloudwatch:API paste.filter_factory = heat.common.wsgi:filter_factory heat.filter_factory = heat.api.cloudwatch:version_negotiation_filter -[filter:cache] -paste.filter_factory = heat.common.wsgi:filter_factory -heat.filter_factory = heat.api.middleware.cache:CacheFilter - -[filter:cachemanage] -paste.filter_factory = heat.common.wsgi:filter_factory -heat.filter_factory = heat.api.middleware.cache_manage:CacheManageFilter - [filter:context] paste.filter_factory = heat.common.context:ContextMiddleware_filter_factory diff --git a/etc/heat/heat-api-paste.ini b/etc/heat/heat-api-paste.ini index a3d87218..18bad73d 100644 --- a/etc/heat/heat-api-paste.ini +++ b/etc/heat/heat-api-paste.ini @@ -19,30 +19,6 @@ pipeline = versionnegotiation authtoken context apiv1app [pipeline:heat-api-custombackend] pipeline = versionnegotiation context custombackendauth apiv1app -# Use the following pipeline to enable transparent caching of image files -# i.e. in heat-api.conf: -# [paste_deploy] -# flavor = caching -# -[pipeline:heat-api-caching] -pipeline = versionnegotiation authtoken context cache apiv1app - -# Use the following pipeline for keystone auth with caching -# i.e. in heat-api.conf: -# [paste_deploy] -# flavor = keystone+caching -# -[pipeline:heat-api-keystone+caching] -pipeline = versionnegotiation authtoken context cache apiv1app - -# Use the following pipeline to enable the Image Cache Management API -# i.e. in heat-api.conf: -# [paste_deploy] -# flavor = cachemanagement -# -[pipeline:heat-api-cachemanagement] -pipeline = versionnegotiation authtoken context cache cachemanage apiv1app - [app:apiv1app] paste.app_factory = heat.common.wsgi:app_factory heat.app_factory = heat.api.openstack.v1:API @@ -51,14 +27,6 @@ heat.app_factory = heat.api.openstack.v1:API paste.filter_factory = heat.common.wsgi:filter_factory heat.filter_factory = heat.api.openstack:version_negotiation_filter -[filter:cache] -paste.filter_factory = heat.common.wsgi:filter_factory -heat.filter_factory = heat.api.middleware.cache:CacheFilter - -[filter:cachemanage] -paste.filter_factory = heat.common.wsgi:filter_factory -heat.filter_factory = heat.api.middleware.cache_manage:CacheManageFilter - [filter:context] paste.filter_factory = heat.common.context:ContextMiddleware_filter_factory -- 2.45.2