rhel: Add ability to enable bridge compatibility mode in /etc/sysconfig/openvswitch

Add the ability to enable bridge compatibility mode through BRCOMPAT
variable in /etc/sysconfig/openvswitch for the rhel build. When
BRCOMPAT is set to 'yes' the brcompat_mod will be loaded and
ovs-brcompatd daemon will be started.

diff --git a/AUTHORS b/AUTHORS
index 645596a48d7f41d04f055f60f6215bbbaae24056..4d10e8683c47fb1a650ed31c356bfc438ce7f6ed 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -41,6 +41,7 @@ Thomas Lacroix          thomas.lacroix@citrix.com
 Todd Deshane            deshantm@gmail.com
 Tom Everman             teverman@google.com
 Tsvi Slonim             tsvi@toroki.com
+Tyler Coumbes           coumbes@gmail.com
 Valient Gough           vgough@pobox.com
 Vivien Bernet-Rollande  vbr@soprive.net
 Wei Yongjun             yjwei@cn.fujitsu.com
@@ -105,7 +106,6 @@ Srini Seetharaman       seethara@stanford.edu
 Stephen Hemminger       shemminger@vyatta.com
 Takayuki HAMA           t-hama@cb.jp.nec.com
 Teemu Koponen           koponen@nicira.com
-Tyler Coumbes           coumbes@gmail.com
 Vishal Swarankar        vishal.swarnkar@gmail.com
 Voravit T.              voravit@kth.se
 YAMAMOTO Takashi        yamamoto@valinux.co.jp

diff --git a/rhel/etc_init.d_openvswitch b/rhel/etc_init.d_openvswitch
index 5501d188156b2f61ce5559f99581567758438480..f1a34c7a9bd6688771de7ad537e57800ea8b596e 100755 (executable)
--- a/rhel/etc_init.d_openvswitch
+++ b/rhel/etc_init.d_openvswitch
@@ -45,6 +45,9 @@ start () {
     if test X"$VSWITCHD_MLOCKALL" != X; then
        set "$@" --mlockall="$VSWITCHD_MLOCKALL"
     fi
+    if test X"$BRCOMPAT" = Xyes; then
+       set "$@" --brcompat
+    fi
     "$@"
 
     $ovs_ctl --protocol=gre enable-protocol

diff --git a/rhel/usr_share_openvswitch_scripts_sysconfig.template b/rhel/usr_share_openvswitch_scripts_sysconfig.template
index 26543af1b52e8b64f51e82f600407714c4c7782f..257fc8239aa95ec361867896ff7d83cabaeb637a 100644 (file)
--- a/rhel/usr_share_openvswitch_scripts_sysconfig.template
+++ b/rhel/usr_share_openvswitch_scripts_sysconfig.template
@@ -18,3 +18,6 @@
 #     system memory pressure in extraordinary situations, such as multiple
 #     concurrent VM import operations.
 # VSWITCHD_MLOCKALL=yes
+
+# BRCOMPAT: If 'yes' compatibility mode will be enabled.
+# BRCOMPAT=yes