openstack/octavia
Code Issues Proposed changes

Merge "devstack: Remove OCTAVIA_USE_MOD_WSGI"

Browse Source
This commit is contained in:
Zuul
2025-09-18 16:00:58 +00:00
committed by Gerrit Code Review
parent 3749f15dd0 a5fc4f3892
commit 633a1c9b71
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 iniset $OCTAVIA_CONF oslo_policy policy_file $OCTAVIA_CONF_DIR/policy.yaml
fi fi
if [[ "$OCTAVIA_USE_MOD_WSGI" == "True" ]]; then _configure_octavia_apache_uwsgi
_configure_octavia_apache_uwsgi
fi
if [ $OCTAVIA_NODE == 'main' ]; then if [ $OCTAVIA_NODE == 'main' ]; then
configure_octavia_api_haproxy configure_octavia_api_haproxy
@@ -576,7 +574,7 @@ function configure_rsyslog {
} }
function octavia_start { function octavia_start {
# octavia-specific start actions
if [ $OCTAVIA_NODE != 'api' ] ; then if [ $OCTAVIA_NODE != 'api' ] ; then
# This is probably out of scope here? Load it from config # This is probably out of scope here? Load it from config
MGMT_PORT_IP=$(iniget $OCTAVIA_CONF health_manager bind_ip) MGMT_PORT_IP=$(iniget $OCTAVIA_CONF health_manager bind_ip)
@@ -596,11 +594,7 @@ function octavia_start {
run_process $OCTAVIA_API_HAPROXY "/usr/sbin/haproxy -db -V -f ${OCTAVIA_CONF_DIR}/haproxy.cfg" run_process $OCTAVIA_API_HAPROXY "/usr/sbin/haproxy -db -V -f ${OCTAVIA_CONF_DIR}/haproxy.cfg"
fi fi
if [[ "$OCTAVIA_USE_MOD_WSGI" == "True" ]]; then _start_octavia_apache_wsgi
_start_octavia_apache_wsgi
else
run_process $OCTAVIA_API "$OCTAVIA_API_BINARY $OCTAVIA_API_ARGS"
fi
run_process $OCTAVIA_DRIVER_AGENT "$OCTAVIA_DRIVER_AGENT_BINARY $OCTAVIA_DRIVER_AGENT_ARGS" run_process $OCTAVIA_DRIVER_AGENT "$OCTAVIA_DRIVER_AGENT_BINARY $OCTAVIA_DRIVER_AGENT_ARGS"
run_process $OCTAVIA_CONSUMER "$OCTAVIA_CONSUMER_BINARY $OCTAVIA_CONSUMER_ARGS" run_process $OCTAVIA_CONSUMER "$OCTAVIA_CONSUMER_BINARY $OCTAVIA_CONSUMER_ARGS"
@@ -612,11 +606,8 @@ function octavia_start {
function octavia_stop { function octavia_stop {
# octavia-specific stop actions # octavia-specific stop actions
if [[ "$OCTAVIA_USE_MOD_WSGI" == "True" ]]; then _stop_octavia_apache_wsgi
_stop_octavia_apache_wsgi
else
stop_process $OCTAVIA_API
fi
stop_process $OCTAVIA_DRIVER_AGENT stop_process $OCTAVIA_DRIVER_AGENT
stop_process $OCTAVIA_CONSUMER stop_process $OCTAVIA_CONSUMER
stop_process $OCTAVIA_HOUSEKEEPER stop_process $OCTAVIA_HOUSEKEEPER
@@ -679,9 +670,8 @@ function octavia_cleanup {
openstack keypair delete ${OCTAVIA_AMP_SSH_KEY_NAME} || true openstack keypair delete ${OCTAVIA_AMP_SSH_KEY_NAME} || true
fi fi
fi fi
if [[ "$OCTAVIA_USE_MOD_WSGI" == "True" ]]; then
_cleanup_octavia_apache_wsgi _cleanup_octavia_apache_wsgi
fi
sudo rm -rf $OCTAVIA_DIR/bin/dual_ca sudo rm -rf $OCTAVIA_DIR/bin/dual_ca
sudo rm -rf $OCTAVIA_DIR/bin/single_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_AMP_EXPIRY_AGE=${OCTAVIA_AMP_EXPIRY_AGE:-"3600"}
OCTAVIA_LB_EXPIRY_AGE=${OCTAVIA_LB_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_CONSUMER_BINARY=${OCTAVIA_CONSUMER_BINARY:-${OCTAVIA_BIN_DIR}/octavia-worker}
OCTAVIA_HOUSEKEEPER_BINARY=${OCTAVIA_HOUSEKEEPER_BINARY:-${OCTAVIA_BIN_DIR}/octavia-housekeeping} OCTAVIA_HOUSEKEEPER_BINARY=${OCTAVIA_HOUSEKEEPER_BINARY:-${OCTAVIA_BIN_DIR}/octavia-housekeeping}
OCTAVIA_HEALTHMANAGER_BINARY=${OCTAVIA_HEALTHMANAGER_BINARY:-${OCTAVIA_BIN_DIR}/octavia-health-manager} OCTAVIA_HEALTHMANAGER_BINARY=${OCTAVIA_HEALTHMANAGER_BINARY:-${OCTAVIA_BIN_DIR}/octavia-health-manager}