Fix OVN DBs cleanup on startup
When initializing OVN, clean up the correct database directory when using OVN from packages (/var/lib/ovn/ instead of /opt/stack/data/ovn/). The /opt/stack/data/ovn location is used only when building OVN from sources, so a fresh devstack deployment with OVN packages may already have hundreds of existing routers and ports, creating ARP collisions. Closes-Bug: #1942201 Change-Id: Ic90d4f2f9d8aaef825ea3325c0ad8fef2a1c5e39
This commit is contained in:
parent
94facb0759
commit
6822ff3944
@ -119,7 +119,13 @@ OVS_SCRIPTDIR=$OVS_SHAREDIR/scripts
|
||||
OVS_DATADIR=$DATA_DIR/ovs
|
||||
OVS_SYSCONFDIR=${OVS_SYSCONFDIR:-$OVS_PREFIX/etc/openvswitch}
|
||||
|
||||
OVN_DATADIR=$DATA_DIR/ovn
|
||||
if [[ "$OVN_BUILD_FROM_SOURCE" == "True" ]]; then
|
||||
OVN_DATADIR=$DATA_DIR/ovn
|
||||
else
|
||||
# When using OVN from packages, the data dir for OVN DBs is
|
||||
# /var/lib/ovn
|
||||
OVN_DATADIR=/var/lib/ovn
|
||||
fi
|
||||
OVN_SHAREDIR=$OVS_PREFIX/share/ovn
|
||||
OVN_SCRIPTDIR=$OVN_SHAREDIR/scripts
|
||||
OVN_RUNDIR=$OVS_PREFIX/var/run/ovn
|
||||
@ -562,13 +568,13 @@ function init_ovn {
|
||||
|
||||
_disable_libvirt_apparmor
|
||||
|
||||
mkdir -p $OVN_DATADIR
|
||||
sudo mkdir -p $OVN_DATADIR
|
||||
mkdir -p $OVS_DATADIR
|
||||
|
||||
rm -f $OVS_DATADIR/*.db
|
||||
rm -f $OVS_DATADIR/.*.db.~lock~
|
||||
rm -f $OVN_DATADIR/*.db
|
||||
rm -f $OVN_DATADIR/.*.db.~lock~
|
||||
sudo rm -f $OVN_DATADIR/*.db
|
||||
sudo rm -f $OVN_DATADIR/.*.db.~lock~
|
||||
}
|
||||
|
||||
function _start_ovs {
|
||||
|
Loading…
x
Reference in New Issue
Block a user