Since SLB bonds are fairly risky (see vswitchd/INTERNALS), it seems
prudent to require users to explicitly configure them.  This patch
defaults to active-backup bonds when no other bond_mode is
explicitly specified.

Signed-off-by: Ethan Jackson <et...@nicira.com>
---
 vswitchd/bridge.c    |    2 +-
 vswitchd/vswitch.xml |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index de773f6..429c3e5 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -2739,7 +2739,7 @@ port_configure_bond(struct port *port, struct 
bond_settings *s,
     size_t i;
 
     s->name = port->name;
-    s->balance = BM_SLB;
+    s->balance = BM_AB;
     if (port->cfg->bond_mode
         && !bond_mode_from_string(&s->balance, port->cfg->bond_mode)) {
         VLOG_WARN("port %s: unknown bond_mode %s, defaulting to %s",
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 84d91da..ae5c094 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -774,7 +774,7 @@
 
       <column name="bond_mode">
         <p>The type of bonding used for a bonded port.  Defaults to
-        <code>balance-slb</code> if unset.
+        <code>active-backup</code> if unset.
         </p>
       </column>
 
-- 
1.7.7.1

_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev

Reply via email to