summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-22 16:54:45 +0000
committerGerrit Code Review <review@openstack.org>2016-03-22 16:54:45 +0000
commit424df742367103271ee2f7d6fe4936bdf3b99827 (patch)
tree1b74bc19ee8fc6238d4ca805a51d8a330d3d89e9
parent7ac441f019214e465a8e26fe03074b9ebd479034 (diff)
parentdf8eb861f35c77e02a94b685bdb88cd1a9513d5a (diff)
Merge "Add BondInterfaceOvsOptions parameter to net-config-bond.yaml"
-rw-r--r--net-config-bond.yaml6
1 files changed, 6 insertions, 0 deletions
diff --git a/net-config-bond.yaml b/net-config-bond.yaml
index b624563f..0a162e77 100644
--- a/net-config-bond.yaml
+++ b/net-config-bond.yaml
@@ -4,6 +4,11 @@ description: >
Software Config to drive os-net-config with 2 bonded nics on a bridge.
parameters:
+ BondInterfaceOvsOptions:
+ default: ''
+ description: The ovs_options string for the bond interface. Set things like
+ lacp=active and/or bond_mode=balance-slb using this option.
+ type: string
ControlPlaneIp:
default: ''
description: IP address/subnet on the ctlplane network
@@ -58,6 +63,7 @@ resources:
type: ovs_bond
name: bond1
use_dhcp: true
+ ovs_options: {get_param: BondInterfaceOvsOptions}
members:
# os-net-config translates nic1 => em1 (for example)
-