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 "Set manila::keystone::auth::tenant"
[apex-tripleo-heat-templates.git]
/
net-config-bond.yaml
diff --git
a/net-config-bond.yaml
b/net-config-bond.yaml
index
0a162e7
..
ec881bd
100644
(file)
--- a/
net-config-bond.yaml
+++ b/
net-config-bond.yaml
@@
-1,4
+1,4
@@
-heat_template_version: 201
5-04-30
+heat_template_version: 201
6-10-14
description: >
Software Config to drive os-net-config with 2 bonded nics on a bridge.
description: >
Software Config to drive os-net-config with 2 bonded nics on a bridge.
@@
-6,9
+6,15
@@
description: >
parameters:
BondInterfaceOvsOptions:
default: ''
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.
+ 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
type: string
+ constraints:
+ - allowed_pattern: "^((?!balance.tcp).)*$"
+ description: |
+ The balance-tcp bond mode is known to cause packet loss and
+ should not be used in BondInterfaceOvsOptions.
ControlPlaneIp:
default: ''
description: IP address/subnet on the ctlplane network
ControlPlaneIp:
default: ''
description: IP address/subnet on the ctlplane network