openstack
/
neutron
Code Issues Proposed changes

Merge "Fix OVS build issue on Fedora"

This commit is contained in:
Zuul 2019-09-08 05:59:17 +00:00 committed by Gerrit Code Review
parent 5f116b97ee f1e1716d06
commit 06cc4b13bb
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
# compilation.
function prepare_for_compilation {
local build_modules=${1:-True}
local build_modules=${1:-False}
OVS_DIR=$DEST/$OVS_REPO_NAME
if [ ! -d $OVS_DIR ] ; then
@ -101,13 +101,13 @@ function reload_kernel_modules {
# compile_ovs() - Compile OVS from source and load needed modules.
# 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
# - third optional parameter defines localstatedir for ovs single machine runtime
# Env variables OVS_REPO_NAME, OVS_REPO and OVS_BRANCH must be set
function compile_ovs {
local _pwd=$PWD
local build_modules=${1:-True}
local build_modules=${1:-False}
local prefix=$2
local localstatedir=$3

2
devstack/plugin.sh
View File

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