X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=network%2Fconfig%2Fbond-with-vlans%2Fcontroller.yaml;h=a28201d18903b5e4fe0cbdfff45e4509ef8836f3;hb=d1c93052959457f1f93d2a5e6aca7db666dc64b8;hp=478581c2546a69cc9c472d5067f215d9f3713455;hpb=4c82514a4d91eeebf4aecd2520d89b3f64d4074b;p=apex-tripleo-heat-templates.git

diff --git a/network/config/bond-with-vlans/controller.yaml b/network/config/bond-with-vlans/controller.yaml
index 478581c2..a28201d1 100644
--- a/network/config/bond-with-vlans/controller.yaml
+++ b/network/config/bond-with-vlans/controller.yaml
@@ -25,6 +25,31 @@ parameters:
     default: ''
     description: IP address/subnet on the tenant network
     type: string
+  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
+  ExternalNetworkVlanID:
+    default: 10
+    description: Vlan ID for the external network traffic.
+    type: number
+  InternalApiNetworkVlanID:
+    default: 20
+    description: Vlan ID for the internal_api network traffic.
+    type: number
+  StorageNetworkVlanID:
+    default: 30
+    description: Vlan ID for the storage network traffic.
+    type: number
+  StorageMgmtNetworkVlanID:
+    default: 40
+    description: Vlan ID for the storage mgmt network traffic.
+    type: number
+  TenantNetworkVlanID:
+    default: 50
+    description: Vlan ID for the tenant network traffic.
+    type: number
 
 resources:
   OsNetConfigImpl:
@@ -51,7 +76,7 @@ resources:
                 -
                   type: ovs_bond
                   name: bond1
-                  ovs_options: vlan_mode=trunk trunks=10,20,30,40,50
+                  ovs_options: {get_param: BondInterfaceOvsOptions}
                   members:
                     -
                       type: interface
@@ -63,35 +88,35 @@ resources:
                 -
                   type: vlan
                   device: bond1
-                  vlan_id: 10
+                  vlan_id: {get_param: ExternalNetworkVlanID}
                   addresses:
                   -
                     ip_netmask: {get_param: ExternalIpSubnet}
                 -
                   type: vlan
                   device: bond1
-                  vlan_id: 20
+                  vlan_id: {get_param: InternalApiNetworkVlanID}
                   addresses:
                   -
                     ip_netmask: {get_param: InternalApiIpSubnet}
                 -
                   type: vlan
                   device: bond1
-                  vlan_id: 30
+                  vlan_id: {get_param: StorageNetworkVlanID}
                   addresses:
                   -
                     ip_netmask: {get_param: StorageIpSubnet}
                 -
                   type: vlan
                   device: bond1
-                  vlan_id: 40
+                  vlan_id: {get_param: StorageMgmtNetworkVlanID}
                   addresses:
                   -
                     ip_netmask: {get_param: StorageMgmtIpSubnet}
                 -
                   type: vlan
                   device: bond1
-                  vlan_id: 50
+                  vlan_id: {get_param: TenantNetworkVlanID}
                   addresses:
                   -
                     ip_netmask: {get_param: TenantIpSubnet}