X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=net-config-bond.yaml;h=ec881bdc058b5840d4a197ed6db972c44bf81c06;hb=2485366158bb8f439500d78c8f341c0a25db0fce;hp=3518dbae643ba8f1311493eebfbc2c788a4b36c0;hpb=9df1991a80724f3179475cb9d561bfadb749822e;p=apex-tripleo-heat-templates.git

diff --git a/net-config-bond.yaml b/net-config-bond.yaml
index 3518dbae..ec881bdc 100644
--- a/net-config-bond.yaml
+++ b/net-config-bond.yaml
@@ -1,8 +1,49 @@
-heat_template_version: 2014-10-16
+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
+    type: string
+  InternalApiIpSubnet:
+    default: ''
+    description: IP address/subnet on the internal API network
+    type: string
+  StorageIpSubnet:
+    default: ''
+    description: IP address/subnet on the storage network
+    type: string
+  StorageMgmtIpSubnet:
+    default: ''
+    description: IP address/subnet on the storage mgmt network
+    type: string
+  TenantIpSubnet:
+    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:
     type: OS::Heat::StructuredConfig
@@ -28,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)
                     -
@@ -38,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}