summaryrefslogtreecommitdiffstats
path: root/network/config/bond-with-vlans
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-06 17:11:47 +0000
committerGerrit Code Review <review@openstack.org>2015-08-06 17:11:47 +0000
commitbd79ed20c8297da5da9bc702b6dae514ac4d73f1 (patch)
tree2532a83312a10e9e243c84c5dc63f9aaaac73518 /network/config/bond-with-vlans
parentbed3b9aeb835cd9c9e12d3e5a4b97db94b49c42b (diff)
parent91207d4ffec6c5dcec53ca06e5233d4e85fb1488 (diff)
Merge "Add a default setting for BondInterfaceOvsOptions"
Diffstat (limited to 'network/config/bond-with-vlans')
-rw-r--r--network/config/bond-with-vlans/controller.yaml3
1 files changed, 2 insertions, 1 deletions
diff --git a/network/config/bond-with-vlans/controller.yaml b/network/config/bond-with-vlans/controller.yaml
index 9d6a6810..3c19f515 100644
--- 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