From fa04137529a6fb8eb3de3455c916340042a72468 Mon Sep 17 00:00:00 2001
From: Hongbin Lu <hongbin034@gmail.com>
Date: Fri, 27 Jun 2025 10:25:46 +0000
Subject: [PATCH] Migrate from wsgi scripts to module paths

setuptools does not build wsgi-scripts in editable wheels anymore,
breaking devstack. Migrate to module paths as per governance [1].

[1]https://governance.openstack.org/tc/goals/proposed/migrate-from-wsgi-scripts-to-module-paths.html

Change-Id: Ibd4bc5214c55f1379738a8df0c2e3a39a6e90df0
---
 devstack/lib/zun                  | 4 ++--
 tox.ini                           | 2 +-
 zun/{api/app.wsgi => wsgi/api.py} | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename zun/{api/app.wsgi => wsgi/api.py} (100%)

diff --git a/devstack/lib/zun b/devstack/lib/zun
index 17db965ce..bb61c65dc 100644
--- a/devstack/lib/zun
+++ b/devstack/lib/zun
@@ -73,7 +73,7 @@ else
     ZUN_BIN_DIR=$(get_python_exec_prefix)
 fi
 
-ZUN_UWSGI=$ZUN_BIN_DIR/zun-api-wsgi
+ZUN_UWSGI=zun.wsgi.api:application
 ZUN_UWSGI_CONF=$ZUN_CONF_DIR/zun-api-uwsgi.ini
 
 DOCKER_REMOTE_API_PORT=2375
@@ -125,7 +125,7 @@ function configure_zun {
     if is_service_enabled zun-api; then
         create_api_paste_conf
 
-        write_uwsgi_config "$ZUN_UWSGI_CONF" "$ZUN_UWSGI" "/container"
+        write_uwsgi_config "$ZUN_UWSGI_CONF" "$ZUN_UWSGI" "/container" "" "zun-api"
     fi
 }
 
diff --git a/tox.ini b/tox.ini
index a48596620..167830d40 100644
--- a/tox.ini
+++ b/tox.ini
@@ -94,7 +94,7 @@ commands =
   stestr slowest
 
 [flake8]
-filename = *.py,app.wsgi
+filename = *.py
 show-source = True
 # [H904] Delay string interpolations at logging calls.
 enable-extensions = H203,H106,H904
diff --git a/zun/api/app.wsgi b/zun/wsgi/api.py
similarity index 100%
rename from zun/api/app.wsgi
rename to zun/wsgi/api.py