openstack/neutron
Code Issues Proposed changes

Fix OVS build issue on Fedora

Browse Source 
No longer build the OVS kernel modules when installing from
source. This was added when OVS didn't support conntrack,
which hasn't been the case for a while.

This is breaking one of the networking-ovn repos periodic jobs.

Depends-on: https://review.opendev.org/#/c/680066/
Change-Id: Ia9cc8f3ee11802f51317eb0e7c82fadd1c15c4b4
Closes-bug: #1830248
This commit is contained in:
Brian Haley 2019-05-23 13:45:16 -04:00 committed by Brian Haley
parent 25d0ad6197
commit f1e1716d06
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/lib/ovs
View File

@ -34,7 +34,7 @@ function load_module {
# prepare_for_compilation() - Fetch ovs git repository and install packages needed for # prepare_for_compilation() - Fetch ovs git repository and install packages needed for
# compilation. # compilation.
function prepare_for_compilation { function prepare_for_compilation {
local build_modules=${1:-True} local build_modules=${1:-False}
OVS_DIR=$DEST/$OVS_REPO_NAME OVS_DIR=$DEST/$OVS_REPO_NAME
if [ ! -d $OVS_DIR ] ; then if [ ! -d $OVS_DIR ] ; then
@ -101,13 +101,13 @@ function reload_kernel_modules {
# compile_ovs() - Compile OVS from source and load needed modules. # compile_ovs() - Compile OVS from source and load needed modules.
# Accepts two parameters: # Accepts two parameters:
# - first one is True by default and means that modules are built and installed. # - first one is False by default and means that modules are not built and installed.
# - second optional parameter defines prefix for ovs compilation # - second optional parameter defines prefix for ovs compilation
# - third optional parameter defines localstatedir for ovs single machine runtime # - third optional parameter defines localstatedir for ovs single machine runtime
# Env variables OVS_REPO_NAME, OVS_REPO and OVS_BRANCH must be set # Env variables OVS_REPO_NAME, OVS_REPO and OVS_BRANCH must be set
function compile_ovs { function compile_ovs {
local _pwd=$PWD local _pwd=$PWD
local build_modules=${1:-True} local build_modules=${1:-False}
local prefix=$2 local prefix=$2
local localstatedir=$3 local localstatedir=$3

2
devstack/plugin.sh
View File

@ -28,7 +28,7 @@ if [[ "$1" == "stack" ]]; then
if [[ "$NEUTRON_AGENT" == "openvswitch" ]] && \ if [[ "$NEUTRON_AGENT" == "openvswitch" ]] && \
[[ "$Q_BUILD_OVS_FROM_GIT" == "True" ]]; then [[ "$Q_BUILD_OVS_FROM_GIT" == "True" ]]; then
remove_ovs_packages remove_ovs_packages
compile_ovs True /usr /var compile_ovs False /usr /var
load_conntrack_gre_module load_conntrack_gre_module
start_new_ovs start_new_ovs
fi fi