openstack/octavia
Code Issues Proposed changes

devstack: Remove OCTAVIA_USE_MOD_WSGI

Browse Source 
As with Nova [1] and Cinder [2] before, nothing is setting this
to false and with the removal of eventlet everywhere nothing will.
Drop both OCTAVIA_USE_MOD_WSGI and the subsequently unused
OCTAVIA_API_BINARY option.

[1] https://review.opendev.org/c/openstack/devstack/+/932195/
[2] https://review.opendev.org/c/openstack/devstack/+/932196/

Change-Id: I7b5f71815a0d8016de3316ce60383b4f51ef0bac
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane
2025-05-06 17:47:15 +01:00
parent 6911bbf5a2
commit a5fc4f3892
2 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
devstack/plugin.sh
View File

@@ -380,9 +380,7 @@ function octavia_configure {
iniset $OCTAVIA_CONF oslo_policy policy_file $OCTAVIA_CONF_DIR/policy.yaml
fi
if [[ "$OCTAVIA_USE_MOD_WSGI" == "True" ]]; then
_configure_octavia_apache_uwsgi
fi
_configure_octavia_apache_uwsgi
if [ $OCTAVIA_NODE == 'main' ]; then
configure_octavia_api_haproxy
@@ -561,7 +559,7 @@ function configure_rsyslog {
}
function octavia_start {
# octavia-specific start actions
if [ $OCTAVIA_NODE != 'api' ] ; then
# This is probably out of scope here? Load it from config
MGMT_PORT_IP=$(iniget $OCTAVIA_CONF health_manager bind_ip)
@@ -581,11 +579,7 @@ function octavia_start {
run_process $OCTAVIA_API_HAPROXY "/usr/sbin/haproxy -db -V -f ${OCTAVIA_CONF_DIR}/haproxy.cfg"
fi
if [[ "$OCTAVIA_USE_MOD_WSGI" == "True" ]]; then
_start_octavia_apache_wsgi
else
run_process $OCTAVIA_API "$OCTAVIA_API_BINARY $OCTAVIA_API_ARGS"
fi
_start_octavia_apache_wsgi
run_process $OCTAVIA_DRIVER_AGENT "$OCTAVIA_DRIVER_AGENT_BINARY $OCTAVIA_DRIVER_AGENT_ARGS"
run_process $OCTAVIA_CONSUMER "$OCTAVIA_CONSUMER_BINARY $OCTAVIA_CONSUMER_ARGS"
@@ -597,11 +591,8 @@ function octavia_start {
function octavia_stop {
# octavia-specific stop actions
if [[ "$OCTAVIA_USE_MOD_WSGI" == "True" ]]; then
_stop_octavia_apache_wsgi
else
stop_process $OCTAVIA_API
fi
_stop_octavia_apache_wsgi
stop_process $OCTAVIA_DRIVER_AGENT
stop_process $OCTAVIA_CONSUMER
stop_process $OCTAVIA_HOUSEKEEPER
@@ -664,9 +655,8 @@ function octavia_cleanup {
openstack keypair delete ${OCTAVIA_AMP_SSH_KEY_NAME} || true
fi
fi
if [[ "$OCTAVIA_USE_MOD_WSGI" == "True" ]]; then
_cleanup_octavia_apache_wsgi
fi
_cleanup_octavia_apache_wsgi
sudo rm -rf $OCTAVIA_DIR/bin/dual_ca
sudo rm -rf $OCTAVIA_DIR/bin/single_ca

2
devstack/settings
View File

@@ -65,8 +65,6 @@ OCTAVIA_LB_TOPOLOGY=${OCTAVIA_LB_TOPOLOGY:-"SINGLE"}
OCTAVIA_AMP_EXPIRY_AGE=${OCTAVIA_AMP_EXPIRY_AGE:-"3600"}
OCTAVIA_LB_EXPIRY_AGE=${OCTAVIA_LB_EXPIRY_AGE:-"3600"}
OCTAVIA_USE_MOD_WSGI=${OCTAVIA_USE_MOD_WSGI:-True}
OCTAVIA_API_BINARY=${OCTAVIA_API_BINARY:-${OCTAVIA_BIN_DIR}/octavia-api}
OCTAVIA_CONSUMER_BINARY=${OCTAVIA_CONSUMER_BINARY:-${OCTAVIA_BIN_DIR}/octavia-worker}
OCTAVIA_HOUSEKEEPER_BINARY=${OCTAVIA_HOUSEKEEPER_BINARY:-${OCTAVIA_BIN_DIR}/octavia-housekeeping}
OCTAVIA_HEALTHMANAGER_BINARY=${OCTAVIA_HEALTHMANAGER_BINARY:-${OCTAVIA_BIN_DIR}/octavia-health-manager}