X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=net-config-bond.yaml;h=ec881bdc058b5840d4a197ed6db972c44bf81c06;hb=9d67d7b3b11b688be0b40fc2fcfb1daf5b5157df;hp=797df4bf0c735fee0227b3d1d265b29d51db09f2;hpb=2e319423c5b9308650a8f8cb7ebe5bd368496095;p=apex-tripleo-heat-templates.git

diff --git a/net-config-bond.yaml b/net-config-bond.yaml
index 797df4bf..ec881bdc 100644
--- a/net-config-bond.yaml
+++ b/net-config-bond.yaml
@@ -1,9 +1,20 @@
-heat_template_version: 2015-04-30
+heat_template_version: 2016-10-14
 
 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
+    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
@@ -28,6 +39,10 @@ parameters:
     default: ''
     description: IP address/subnet on the tenant network
     type: string
+  ManagementIpSubnet:
+    default: ''
+    description: IP address/subnet on the management network
+    type: string
 
 resources:
   OsNetConfigImpl:
@@ -54,6 +69,7 @@ resources:
                   type: ovs_bond
                   name: bond1
                   use_dhcp: true
+                  ovs_options: {get_param: BondInterfaceOvsOptions}
                   members:
                     # os-net-config translates nic1 => em1 (for example)
                     -