From cab97a6269573b249b069498eef41416472fc03d Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 11 Sep 2023 11:26:25 +0900
Subject: [PATCH] Do not load api-paste.ini using oslo.config

We expect that the api-paste.ini file contains pipeline definitions for
paste, which are different from service options. Thus we should not
load this file using oslo.config.

Change-Id: Ic03c5f9295e95bd967ab8d305ed8340b6e69e235
---
 glance/common/wsgi_app.py                                   | 3 +--
 .../notes/do-not-load-paste-ini-1ec473693037ee5b.yaml       | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/do-not-load-paste-ini-1ec473693037ee5b.yaml

diff --git a/glance/common/wsgi_app.py b/glance/common/wsgi_app.py
index c2a0cba2a6..884da53103 100644
--- a/glance/common/wsgi_app.py
+++ b/glance/common/wsgi_app.py
@@ -41,8 +41,7 @@ except ImportError:
     LOG.debug('Detected not running under uwsgi')
     uwsgi = None
 
-CONFIG_FILES = ['glance-api-paste.ini',
-                'glance-image-import.conf',
+CONFIG_FILES = ['glance-image-import.conf',
                 'glance-api.conf']
 
 # Reserved file stores for staging and tasks operations
diff --git a/releasenotes/notes/do-not-load-paste-ini-1ec473693037ee5b.yaml b/releasenotes/notes/do-not-load-paste-ini-1ec473693037ee5b.yaml
new file mode 100644
index 0000000000..c4515dab8a
--- /dev/null
+++ b/releasenotes/notes/do-not-load-paste-ini-1ec473693037ee5b.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    The glance-api service no longer attempts to load ``api-paste.ini`` file as
+    its service config file. All config options should be written in service
+    config files such as ``glance-api.conf``.