Add a default setting for BondInterfaceOvsOptions

This change adds a default setting for the OVS bond options to the
bond-with-vlans controller.yaml. This default will attempt to bring
up LACP bonding, but should that fail it will bring up the bond in
active/backup mode. This is a safe configuration if the switch is
not configured for bonding.

Change-Id: I91aad1e061ed1ecf26636e60da7a9a6e9cde50a5

diff --git a/network/config/bond-with-vlans/controller.yaml b/network/config/bond-with-vlans/controller.yaml
index 9d6a681..3c19f51 100644 (file)
--- a/network/config/bond-with-vlans/controller.yaml
+++ b/network/config/bond-with-vlans/controller.yaml
@@ -26,9 +26,10 @@ parameters:
     description: IP address/subnet on the tenant network
     type: string
   BondInterfaceOvsOptions:
-    default: ''
+    default: 'bond_mode=balance-tcp lacp=active other-config:lacp-fallback-ab=true'
     description: The ovs_options string for the bond interface. Set things like
                  lacp=active and/or bond_mode=balance-slb using this option.
+                 Default wil attempt LACP, but will fall back to active-backup.
     type: string
   ExternalNetworkVlanID:
     default: 10