summaryrefslogtreecommitdiffstats
path: root/network/config/bond-with-vlans/compute.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-16 07:50:28 +0000
committerGerrit Code Review <review@openstack.org>2015-06-16 07:50:28 +0000
commit48d07db384a3e8a36a2a92e95ef3ad4ed5c6071e (patch)
treec3b1700b85fef89555a3099d46c98977c31b03fd /network/config/bond-with-vlans/compute.yaml
parent1a3049c32e78c40e3ba9b275b9c278e65aa397e1 (diff)
parent5041ff897dcfb2b9cec5bff1f15060913704e43a (diff)
Merge "Add BondInterfaceOvsOptions parameter"
Diffstat (limited to 'network/config/bond-with-vlans/compute.yaml')
-rw-r--r--network/config/bond-with-vlans/compute.yaml7
1 files changed, 6 insertions, 1 deletions
diff --git a/network/config/bond-with-vlans/compute.yaml b/network/config/bond-with-vlans/compute.yaml
index d7113c8c..d9d15ad1 100644
--- a/network/config/bond-with-vlans/compute.yaml
+++ b/network/config/bond-with-vlans/compute.yaml
@@ -25,6 +25,11 @@ parameters:
default: ''
description: IP address/subnet on the tenant network
type: string
+ 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
resources:
OsNetConfigImpl:
@@ -51,7 +56,7 @@ resources:
-
type: ovs_bond
name: bond1
- ovs_options: vlan_mode=trunk trunks=10,20,30,40,50
+ ovs_options: {get_param: BondInterfaceOvsOptions}
members:
-
type: interface