From 6b241bb13c400f28401605e05d66facf661460fb Mon Sep 17 00:00:00 2001
From: Brian Haley <bhaley@redhat.com>
Date: Wed, 25 Sep 2019 08:54:45 -0400
Subject: [PATCH] Always make sure openvswitch kernel module is loaded

In change https://review.opendev.org/#/c/661065/ we stopped
compiling openvswitch from source, which was always doing
a reload of the kernel module.  We've seen in some cases
the module isn't loaded, so change to always load the
module unconditionally to avoid this.

Change-Id: I2ac2aa4cc84d6f5ac62bc8c7aec67ac17d89c614
Closes-bug: #1845324
---
 devstack/lib/ovs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/devstack/lib/ovs b/devstack/lib/ovs
index 0a3d5054436..ba3383bc176 100644
--- a/devstack/lib/ovs
+++ b/devstack/lib/ovs
@@ -27,7 +27,7 @@ function load_module {
     if [ "$(trueorfalse True fatal)" == "True" ]; then
         sudo modprobe $module || (dmesg && die $LINENO "FAILED TO LOAD $module")
     else
-        sudo modprobe $module || (echo "FAILED TO LOAD vport_geneve" && dmesg)
+        sudo modprobe $module || (echo "FAILED TO LOAD $module" && dmesg)
     fi
 }
 
@@ -85,6 +85,12 @@ function prepare_for_compilation {
     fi
 }
 
+# load_kernel_modules() - load openvswitch kernel module
+function load_kernel_modules {
+    load_module openvswitch
+    load_module vport-geneve False
+    dmesg | tail
+}
 
 # reload_kernel_modules() - reload openvswitch kernel module
 function reload_kernel_modules {
@@ -94,9 +100,7 @@ function reload_kernel_modules {
     fi
     sudo modprobe -r vport_geneve
     sudo modprobe -r openvswitch
-    load_module openvswitch
-    load_module vport-geneve False
-    dmesg | tail
+    load_kernel_modules
 }
 
 # compile_ovs() - Compile OVS from source and load needed modules.
@@ -136,6 +140,8 @@ function compile_ovs {
     if [[ "$build_modules" == "True" ]]; then
         sudo make INSTALL_MOD_DIR=kernel/net/openvswitch modules_install
         reload_kernel_modules
+    else
+        load_kernel_modules
     fi
 
     cd $_pwd