Merge "Fix grammar nits in bond-with-vlans templates"

[apex-tripleo-heat-templates.git] / network / config / single-nic-vlans / cinder-storage.yaml

diff --git a/network/config/single-nic-vlans/cinder-storage.yaml b/network/config/single-nic-vlans/cinder-storage.yaml
index 72f6126..397b1ec 100644 (file)
--- a/network/config/single-nic-vlans/cinder-storage.yaml
+++ b/network/config/single-nic-vlans/cinder-storage.yaml
@@ -25,6 +25,18 @@ parameters:
     default: ''
     description: IP address/subnet on the tenant network
     type: string
+  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
 
 resources:
   OsNetConfigImpl:
@@ -42,24 +54,23 @@ resources:
                 -
                   type: interface
                   name: nic1
-                  ovs_options: vlan_mode=trunk trunks=10,20,30,40,50
                   # force the MAC address of the bridge to this interface
                   primary: true
                 -
                   type: vlan
-                  vlan_id: 20
+                  vlan_id: {get_param: InternalApiNetworkVlanID}
                   addresses:
                   -
                     ip_netmask: {get_param: InternalApiIpSubnet}
                 -
                   type: vlan
-                  vlan_id: 30
+                  vlan_id: {get_param: StorageNetworkVlanID}
                   addresses:
                   -
                     ip_netmask: {get_param: StorageIpSubnet}
                 -
                   type: vlan
-                  vlan_id: 40
+                  vlan_id: {get_param: StorageMgmtNetworkVlanID}
                   addresses:
                   -
                     ip_netmask: {get_param: StorageMgmtIpSubnet}