From fd9e8b945592dc51f465b7edde7ea8b946e01f6b Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Wed, 16 Oct 2024 11:16:49 +0100 Subject: [PATCH] devstack: Remove IRONIC_USE_MOD_WSGI Nothing is setting this anymore, making this a layer of indirection we do not need. Remove it. Change-Id: Iba3674536ee98ba4d2d0cb5ffb0ec52e5286b7e7 Signed-off-by: Stephen Finucane --- devstack/lib/ironic | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 7832255a81..c931903dfc 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -75,19 +75,10 @@ IRONIC_AUTH_CACHE_DIR=${IRONIC_AUTH_CACHE_DIR:-/var/cache/ironic} IRONIC_CONF_DIR=${IRONIC_CONF_DIR:-/etc/ironic} IRONIC_CONF_FILE=$IRONIC_CONF_DIR/ironic.conf IRONIC_MACHINE_TYPE=${IRONIC_MACHINE_TYPE:-q35} -# Deploy Ironic API under uwsgi (NOT mod_wsgi) server. -# Devstack aims to remove mod_wsgi support, so ironic shouldn't use it too. -# If set to False that will fall back to use the eventlet server that -# can happen on grenade runs. -# The (confusing) name IRONIC_USE_MOD_WSGI is left for backward compatibility, -# for example during grenade runs -# TODO(pas-ha) remove IRONIC_USE_MOD_WSGI var after oldest supported -# stable branch is stable/rocky -IRONIC_USE_MOD_WSGI=$(trueorfalse $ENABLE_HTTPD_MOD_WSGI_SERVICES IRONIC_USE_MOD_WSGI) # If True, will deploy Ironic API under WSGI server, currently supported one # is uwsgi. # Defaults to the (now confusingly named) IRONIC_USE_MOD_WSGI for backward compat -IRONIC_USE_WSGI=$(trueorfalse $IRONIC_USE_MOD_WSGI IRONIC_USE_WSGI) +IRONIC_USE_WSGI=$(trueorfalse $ENABLE_HTTPD_MOD_WSGI_SERVICES IRONIC_USE_WSGI) # Whether DevStack will be setup for bare metal or VMs IRONIC_IS_HARDWARE=$(trueorfalse False IRONIC_IS_HARDWARE)