Skip to content

Commit 6dd896f

Browse files
committed
Allow to skip stop of ovn services
Grenade jobs stop services, check fip connectivity for a nova server and then upgrade to next release. But since ovn data plane and db services are stopped along with other services, fip connectivity fails as a result. We shouldn't stop these services along with other neutron services. This patch adds a new variable "SKIP_STOP_OVN" which can be used by grenade jobs to skip stop of ovn services. This will also fix the ovn grenade jobs. Also source fixup_stuff.sh so function fixup_ovn_centos is available. It's already sourced in stack.sh but that's not used in grenade run. Change-Id: I94818a19f19973779cb2e11753d2881d54dfa3bc
1 parent 0e08e9b commit 6dd896f

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

lib/neutron-legacy

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@ Q_NOTIFY_NOVA_PORT_DATA_CHANGES=${Q_NOTIFY_NOVA_PORT_DATA_CHANGES:-True}
138138
VIF_PLUGGING_IS_FATAL=${VIF_PLUGGING_IS_FATAL:-True}
139139
VIF_PLUGGING_TIMEOUT=${VIF_PLUGGING_TIMEOUT:-300}
140140

141+
# Allow to skip stopping of OVN services
142+
SKIP_STOP_OVN=${SKIP_STOP_OVN:-False}
143+
141144
# The directory which contains files for Q_PLUGIN_EXTRA_CONF_FILES.
142145
# /etc/neutron is assumed by many of devstack plugins. Do not change.
143146
_Q_PLUGIN_EXTRA_CONF_PATH=/etc/neutron
@@ -638,7 +641,7 @@ function stop_mutnauq {
638641
stop_mutnauq_other
639642
stop_mutnauq_l2_agent
640643

641-
if [[ $Q_AGENT == "ovn" ]]; then
644+
if [[ $Q_AGENT == "ovn" && $SKIP_STOP_OVN != "True" ]]; then
642645
stop_ovn
643646
fi
644647
}

lib/neutron_plugins/ovn_agent

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,8 @@ function install_ovn {
395395
sudo mkdir -p $OVS_PREFIX/var/log/ovn
396396
sudo chown $(whoami) $OVS_PREFIX/var/log/ovn
397397
else
398+
# Load fixup_ovn_centos
399+
source ${TOP_DIR}/tools/fixup_stuff.sh
398400
fixup_ovn_centos
399401
install_package $(get_packages openvswitch)
400402
install_package $(get_packages ovn)

0 commit comments

Comments
 (0)