Remove dependency on mod_wsgi

Signed-off-by: Dmitry Tantsur <dtantsur@protonmail.com>
metal3-io · Mar 15, 2024 · 06a225e · 06a225e
1 parent fb59244
commit 06a225e
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 5 deletions.
diff --git a/ironic-config/httpd-ironic-api.conf.j2 b/ironic-config/httpd-ironic-api.conf.j2
@@ -29,7 +29,6 @@ Listen {{ env.IRONIC_URL_HOST }}:{{ env.IRONIC_LISTEN_PORT }}
 
     SetEnv APACHE_RUN_USER ironic
     SetEnv APACHE_RUN_GROUP ironic
-    WSGIProcessGroup ironic
 
     ErrorLog /dev/stderr
     LogLevel debug

diff --git a/ironic-config/httpd-modules.conf b/ironic-config/httpd-modules.conf
@@ -5,7 +5,6 @@ LoadModule dir_module modules/mod_dir.so
 LoadModule authz_core_module modules/mod_authz_core.so
 LoadModule unixd_module modules/mod_unixd.so
 LoadModule mpm_event_module modules/mod_mpm_event.so
-LoadModule wsgi_module modules/mod_wsgi_python3.so
 LoadModule ssl_module modules/mod_ssl.so
 LoadModule env_module modules/mod_env.so
 LoadModule proxy_module modules/mod_proxy.so

diff --git a/main-packages-list.txt b/main-packages-list.txt
@@ -8,7 +8,6 @@ iproute
 mod_ssl
 procps
 python3-jinja2
-python3-mod_wsgi
 qemu-img
 sqlite
 syslinux-nonlinux

diff --git a/scripts/auth-common.sh b/scripts/auth-common.sh
@@ -22,8 +22,7 @@ configure_client_basic_auth()
     local auth_config_file="/auth/$1/auth-config"
     local dest="${2:-/etc/ironic/ironic.conf}"
     if [[ -f "${auth_config_file}" ]]; then
-        # Merge configurations in the "auth" directory into the default ironic configuration file because there is no way to choose the configuration file
-        # when running the api as a WSGI app.
+        # Merge configurations in the "auth" directory into the default ironic configuration file
         crudini --merge "${dest}" < "${auth_config_file}"
     fi
 }