Add params needed for the ceph-ansible switch to containers playbook

[apex-tripleo-heat-templates.git] / network / config / single-nic-linux-bridge-vlans / compute.yaml

diff --git a/network/config/single-nic-linux-bridge-vlans/compute.yaml b/network/config/single-nic-linux-bridge-vlans/compute.yaml
index a21bc8f..a637ef0 100644 (file)
--- a/network/config/single-nic-linux-bridge-vlans/compute.yaml
+++ b/network/config/single-nic-linux-bridge-vlans/compute.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 description: >
   Software Config to drive os-net-config to configure VLANs for the compute role.
 parameters:
@@ -125,6 +125,12 @@ resources:
                 addresses:
                 - ip_netmask:
                     get_param: StorageIpSubnet
+              # Uncomment when including environments/hyperconverged-ceph.yaml
+              #- type: vlan
+              #  vlan_id: {get_param: StorageMgmtNetworkVlanID}
+              #  device: bridge_name
+              #  addresses:
+              #    - ip_netmask: {get_param: StorageMgmtIpSubnet}
               - type: vlan
                 vlan_id:
                   get_param: TenantNetworkVlanID
@@ -135,16 +141,13 @@ resources:
               # Uncomment when including environments/network-management.yaml
               # If setting default route on the Management interface, comment
               # out the default route on the Control Plane.
-              #-
-              #  type: vlan
+              #- type: vlan
               #  vlan_id: {get_param: ManagementNetworkVlanID}
               #  device: bridge_name
               #  addresses:
-              #    -
-              #      ip_netmask: {get_param: ManagementIpSubnet}
+              #    - ip_netmask: {get_param: ManagementIpSubnet}
               #  routes:
-              #    -
-              #      default: true
+              #    - default: true
               #      next_hop: {get_param: ManagementInterfaceDefaultRoute}
 outputs:
   OS::stack_id: