X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=net-config-bond.yaml;h=ec881bdc058b5840d4a197ed6db972c44bf81c06;hb=cac8c7d28584a56321dbaf8b0ca5fd6e8986deb2;hp=d41356acb1cfccdf001c32061dc6d9db834b2704;hpb=7587446c6e1030bb85a019b13ef3a757b4d5fb79;p=apex-tripleo-heat-templates.git

diff --git a/net-config-bond.yaml b/net-config-bond.yaml
index d41356ac..ec881bdc 100644
--- a/net-config-bond.yaml
+++ b/net-config-bond.yaml
@@ -1,9 +1,24 @@
-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
+    type: string
   ExternalIpSubnet:
     default: ''
     description: IP address/subnet on the external network
@@ -24,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:
@@ -50,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)
                     -
@@ -60,7 +80,6 @@ resources:
                       name: nic2
 
 outputs:
-  config_id:
-    description: The ID of the OsNetConfigImpl resource.
-    value:
-      {get_resource: OsNetConfigImpl}
+  OS::stack_id:
+    description: The OsNetConfigImpl resource.
+    value: {get_resource: OsNetConfigImpl}