openstack/devstack
Code Issues Proposed changes

Merge "Allow to skip stop of ovn services"

Browse Source
This commit is contained in:
Zuul 2022-06-03 20:40:15 +00:00 committed by Gerrit Code Review
commit e661cae7e8
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/neutron-legacy
View File

@ -138,6 +138,9 @@ Q_NOTIFY_NOVA_PORT_DATA_CHANGES=${Q_NOTIFY_NOVA_PORT_DATA_CHANGES:-True}
VIF_PLUGGING_IS_FATAL=${VIF_PLUGGING_IS_FATAL:-True} VIF_PLUGGING_IS_FATAL=${VIF_PLUGGING_IS_FATAL:-True}
VIF_PLUGGING_TIMEOUT=${VIF_PLUGGING_TIMEOUT:-300} VIF_PLUGGING_TIMEOUT=${VIF_PLUGGING_TIMEOUT:-300}
# Allow to skip stopping of OVN services
SKIP_STOP_OVN=${SKIP_STOP_OVN:-False}
# The directory which contains files for Q_PLUGIN_EXTRA_CONF_FILES. # The directory which contains files for Q_PLUGIN_EXTRA_CONF_FILES.
# /etc/neutron is assumed by many of devstack plugins. Do not change. # /etc/neutron is assumed by many of devstack plugins. Do not change.
_Q_PLUGIN_EXTRA_CONF_PATH=/etc/neutron _Q_PLUGIN_EXTRA_CONF_PATH=/etc/neutron
@ -638,7 +641,7 @@ function stop_mutnauq {
stop_mutnauq_other stop_mutnauq_other
stop_mutnauq_l2_agent stop_mutnauq_l2_agent
if [[ $Q_AGENT == "ovn" ]]; then if [[ $Q_AGENT == "ovn" && $SKIP_STOP_OVN != "True" ]]; then
stop_ovn stop_ovn
fi fi
} }

2
lib/neutron_plugins/ovn_agent
View File

@ -395,6 +395,8 @@ function install_ovn {
sudo mkdir -p $OVS_PREFIX/var/log/ovn sudo mkdir -p $OVS_PREFIX/var/log/ovn
sudo chown $(whoami) $OVS_PREFIX/var/log/ovn sudo chown $(whoami) $OVS_PREFIX/var/log/ovn
else else
# Load fixup_ovn_centos
source ${TOP_DIR}/tools/fixup_stuff.sh
fixup_ovn_centos fixup_ovn_centos
install_package $(get_packages openvswitch) install_package $(get_packages openvswitch)
install_package $(get_packages ovn) install_package $(get_packages ovn)