openstack/neutron
Code Issues Proposed changes

Merge "Define localstatedir for ovs compilation"

Browse Source
This commit is contained in:
Jenkins
2016-04-06 18:27:16 +00:00
committed by Gerrit Code Review
parent b51a669554 92af3114a7
commit 1af2a3e48e
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
devstack/lib/ovs
View File

@@ -35,16 +35,22 @@ function load_module {
# Accepts two parameters: # Accepts two parameters:
# - first one is True, modules are built and installed. # - first one is True, modules are 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
# 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:-True}
local prefix=$2 local prefix=$2
local localstatedir=$3
if [ -n "$prefix" ]; then if [ -n "$prefix" ]; then
prefix="--prefix=$prefix" prefix="--prefix=$prefix"
fi fi
if [ -n "$localstatedir" ]; then
localstatedir="--localstatedir=$localstatedir"
fi
cd $DEST cd $DEST
if [ ! -d $OVS_REPO_NAME ] ; then if [ ! -d $OVS_REPO_NAME ] ; then
git clone $OVS_REPO git clone $OVS_REPO
@@ -67,9 +73,9 @@ function compile_ovs {
fi fi
if [ ! -f config.status ] || [ configure -nt config.status ] ; then if [ ! -f config.status ] || [ configure -nt config.status ] ; then
if [[ "$build_modules" == "True" ]]; then if [[ "$build_modules" == "True" ]]; then
./configure $prefix --with-linux=/lib/modules/$(uname -r)/build ./configure $prefix $localstatedir --with-linux=/lib/modules/$(uname -r)/build
else else
./configure $prefix ./configure $prefix $localstatedir
fi fi
fi fi
make -j$[$(nproc) + 1] make -j$[$(nproc) + 1]

2
neutron/tests/contrib/gate_hook.sh
View File

@@ -33,7 +33,7 @@ then
uninstall_package $package uninstall_package $package
fi fi
done done
compile_ovs True /usr compile_ovs True /usr /var
start_new_ovs start_new_ovs
fi fi