Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Make OVS ARP responder feature configurable"
[apex-tripleo-heat-templates.git]
/
net-config-bond.yaml
diff --git
a/net-config-bond.yaml
b/net-config-bond.yaml
index
b624563
..
0a162e7
100644
(file)
--- 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:
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
ControlPlaneIp:
default: ''
description: IP address/subnet on the ctlplane network
@@
-58,6
+63,7
@@
resources:
type: ovs_bond
name: bond1
use_dhcp: true
type: ovs_bond
name: bond1
use_dhcp: true
+ ovs_options: {get_param: BondInterfaceOvsOptions}
members:
# os-net-config translates nic1 => em1 (for example)
-
members:
# os-net-config translates nic1 => em1 (for example)
-