summaryrefslogtreecommitdiffstats
path: root/network/config
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-12 10:24:46 +0000
committerGerrit Code Review <review@openstack.org>2015-11-12 10:24:46 +0000
commit358e68102a2da6e97fb84731cee39ed9401703a8 (patch)
tree1198a06302540dab19dae788d2c810626f6ccd01 /network/config
parent1b22aed7054ca08e93d870bdc6103c36f97c4b17 (diff)
parent215cf39c709419f018be02b208af10f2bd4c772e (diff)
Merge "Change default bond-mode"
Diffstat (limited to 'network/config')
-rw-r--r--network/config/bond-with-vlans/controller.yaml3
1 files changed, 1 insertions, 2 deletions
diff --git a/network/config/bond-with-vlans/controller.yaml b/network/config/bond-with-vlans/controller.yaml
index 4290be20..eb4399ea 100644
--- a/network/config/bond-with-vlans/controller.yaml
+++ b/network/config/bond-with-vlans/controller.yaml
@@ -30,10 +30,9 @@ parameters:
description: IP address/subnet on the tenant network
type: string
BondInterfaceOvsOptions:
- default: 'bond_mode=balance-tcp lacp=active other-config:lacp-fallback-ab=true'
+ default: 'bond_mode=active-backup'
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