X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=network%2Fconfig%2Fsingle-nic-vlans%2Fcinder-storage.yaml;h=397b1ecdd44d75e811fabe91e4d49b064dc51660;hb=19c9618cade3aaf66c8f8f75e09077d2bf3a8b97;hp=1ca239c13744b030e8af4f6920fdf373cfd0c741;hpb=4fe67fdc38f66f2ee03423b8154dbb19baced46a;p=apex-tripleo-heat-templates.git

diff --git a/network/config/single-nic-vlans/cinder-storage.yaml b/network/config/single-nic-vlans/cinder-storage.yaml
index 1ca239c1..397b1ecd 100644
--- 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:
@@ -36,33 +48,29 @@ resources:
           network_config:
             -
               type: ovs_bridge
-              name: {get_input: bridge_name}
+              name: br-storage
               use_dhcp: true
               members:
                 -
                   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
-                  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}