From c1827a3f3334a6a686d85d1060ab49afe39a62bb Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 16 Sep 2025 17:47:58 +0100 Subject: [PATCH] setup: Remove pbr's wsgi_scripts This is technical dead end and not something that's supported by default in the any versions of setuptools released in over 6 months (and therefore, by extension, pbr). It's time to remove it. Some references to wsgi scripts and the eventlet server are removed. Change-Id: I8e340403808287a594cb742c24bcf6343fa42caa Signed-off-by: Stephen Finucane --- httpd/glance-api-uwsgi.ini | 2 +- .../notes/remove-wsgi-script-1b6bcc68eba5ef0a.yaml | 7 +++++++ setup.cfg | 2 -- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/remove-wsgi-script-1b6bcc68eba5ef0a.yaml diff --git a/httpd/glance-api-uwsgi.ini b/httpd/glance-api-uwsgi.ini index 661dd3fbef..d63d952ba4 100644 --- a/httpd/glance-api-uwsgi.ini +++ b/httpd/glance-api-uwsgi.ini @@ -15,4 +15,4 @@ die-on-term = true master = true processes = 4 http-socket = 127.0.0.1:60999 -wsgi-file = /usr/local/bin/glance-wsgi-api +module = glance.wsgi.api:application diff --git a/releasenotes/notes/remove-wsgi-script-1b6bcc68eba5ef0a.yaml b/releasenotes/notes/remove-wsgi-script-1b6bcc68eba5ef0a.yaml new file mode 100644 index 0000000000..dd5ec702ff --- /dev/null +++ b/releasenotes/notes/remove-wsgi-script-1b6bcc68eba5ef0a.yaml @@ -0,0 +1,7 @@ +--- +upgrade: + - | + The WSGI script ``glance-wsgi-api`` has been removed. Deployment tooling + should instead reference the Python module path for this service, + ``glance.wsgi.api``, if their chosen WSGI server supports this (gunicorn, + uWSGI) or implement a ``.wsgi`` script themselves if not (mod_wsgi). diff --git a/setup.cfg b/setup.cfg index 476961bd57..cbd4601ff0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -44,8 +44,6 @@ console_scripts = glance-replicator = glance.cmd.replicator:main glance-scrubber = glance.cmd.scrubber:main glance-status = glance.cmd.status:main -wsgi_scripts = - glance-wsgi-api = glance.common.wsgi_app:init_app oslo.config.opts = glance.api = glance.opts:list_api_opts glance.scrubber = glance.opts:list_scrubber_opts