X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=net-config-bond.yaml;h=0a162e77329fc3d2639989bca872197c4579c756;hb=43a358c910865f23f9408e676c0a6b284875d422;hp=d74fc0bc752ce69f5d3e520e64917a09e875a641;hpb=e02baab696e25525b31991791c95422060fc7136;p=apex-tripleo-heat-templates.git

diff --git a/net-config-bond.yaml b/net-config-bond.yaml
index d74fc0bc..0a162e77 100644
--- a/net-config-bond.yaml
+++ b/net-config-bond.yaml
@@ -4,6 +4,15 @@ 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
+  ControlPlaneIp:
+    default: ''
+    description: IP address/subnet on the ctlplane network
+    type: string
   ExternalIpSubnet:
     default: ''
     description: IP address/subnet on the external network
@@ -24,6 +33,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 +63,7 @@ resources:
                   type: ovs_bond
                   name: bond1
                   use_dhcp: true
+                  ovs_options: {get_param: BondInterfaceOvsOptions}
                   members:
                     # os-net-config translates nic1 => em1 (for example)
                     -