From 04541ae72b4b032960e2a2a218f7b9f18602e0c8 Mon Sep 17 00:00:00 2001 From: Erno Kuvaja Date: Thu, 29 Jul 2021 12:50:36 +0100 Subject: [PATCH] Clean out deprecations from paste.ini The etc/glance-api-paste.ini had still couple of pipelines left behind from registry and osprofile options deprecated in 2015. This change clears those and removes the reference note from configuring doc. Change-Id: Idb78cd2935a9ea5a1b1bc3ee6153311190422ca5 --- doc/source/configuration/configuring.rst | 6 ------ etc/glance-api-paste.ini | 14 -------------- 2 files changed, 20 deletions(-) diff --git a/doc/source/configuration/configuring.rst b/doc/source/configuration/configuring.rst index e6da2ec6bd..4205ad2281 100644 --- a/doc/source/configuration/configuring.rst +++ b/doc/source/configuration/configuring.rst @@ -1599,12 +1599,6 @@ profiling feature for glance-api service. in their deployment. Without HMAC key the profiling will not be triggered even profiling feature is enabled. - **IMPORTANT NOTE**: previously HMAC keys (as well as enabled parameter) were - placed at `/etc/glance/api-paste.ini` file for Glance API service - respectively. Starting with osprofiler 0.3.1 release there is no need to set - these arguments in the `*-paste.ini` files. This functionality is still - supported, although the config values are having larger priority. - The config value ``trace_sqlalchemy`` is used to determine whether fully enable sqlalchemy engine based SQL execution profiling feature for glance-api service. diff --git a/etc/glance-api-paste.ini b/etc/glance-api-paste.ini index a3caddb3c8..37a9943de4 100644 --- a/etc/glance-api-paste.ini +++ b/etc/glance-api-paste.ini @@ -22,18 +22,6 @@ pipeline = cors healthcheck http_proxy_to_wsgi versionnegotiation osprofiler aut [pipeline:glance-api-keystone+cachemanagement] pipeline = cors healthcheck http_proxy_to_wsgi versionnegotiation osprofiler authtoken context cache cachemanage rootapp -# Use this pipeline for authZ only. This means that the registry will treat a -# user as authenticated without making requests to keystone to reauthenticate -# the user. -[pipeline:glance-api-trusted-auth] -pipeline = cors healthcheck http_proxy_to_wsgi versionnegotiation osprofiler context rootapp - -# Use this pipeline for authZ only. This means that the registry will treat a -# user as authenticated without making requests to keystone to reauthenticate -# the user and uses cache management -[pipeline:glance-api-trusted-auth+cachemanagement] -pipeline = cors healthcheck http_proxy_to_wsgi versionnegotiation osprofiler context cache cachemanage rootapp - [composite:rootapp] paste.composite_factory = glance.api:root_app_factory /: apiversions @@ -74,8 +62,6 @@ paste.filter_factory = glance.api.middleware.gzip:GzipMiddleware.factory [filter:osprofiler] paste.filter_factory = osprofiler.web:WsgiMiddleware.factory -hmac_keys = SECRET_KEY #DEPRECATED -enabled = yes #DEPRECATED [filter:cors] paste.filter_factory = oslo_middleware.cors:filter_factory