Merge "Define localstatedir for ovs compilation"

openstack · Apr 6, 2016 · 1af2a3e · 1af2a3e
2 parents b51a669 + 92af311
commit 1af2a3e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/devstack/lib/ovs b/devstack/lib/ovs
@@ -35,16 +35,22 @@ function load_module {
 #                 Accepts two parameters:
 #                   - first one is True, modules are 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 prefix=$2
+    local localstatedir=$3
 
     if [ -n "$prefix" ]; then
         prefix="--prefix=$prefix"
     fi
 
+    if [ -n "$localstatedir" ]; then
+        localstatedir="--localstatedir=$localstatedir"
+    fi
+
     cd $DEST
     if [ ! -d $OVS_REPO_NAME ] ; then
         git clone $OVS_REPO
@@ -67,9 +73,9 @@ function compile_ovs {
     fi
     if [ ! -f config.status ] || [ configure -nt config.status ] ; 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
-            ./configure $prefix
+            ./configure $prefix $localstatedir
         fi
     fi
     make -j$[$(nproc) + 1]

diff --git a/neutron/tests/contrib/gate_hook.sh b/neutron/tests/contrib/gate_hook.sh
@@ -33,7 +33,7 @@ then
                 uninstall_package $package
             fi
         done
-        compile_ovs True /usr
+        compile_ovs True /usr /var
         start_new_ovs
     fi