Browse Source

Merge "Fix OVS build issue on Fedora"

tags/15.0.0.0b1
Zuul 1 month ago
parent
commit
06cc4b13bb
2 changed files with 4 additions and 4 deletions
  1. 3
    3
      devstack/lib/ovs
  2. 1
    1
      devstack/plugin.sh

+ 3
- 3
devstack/lib/ovs View File

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

+ 1
- 1
devstack/plugin.sh View File

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

Loading…
Cancel
Save