Add sample usage of StorageMgmt network for compute nodes

The hyperconverged-ceph.yaml environment file assumes there will be
a StorageMgmt network deployed on compute nodes. This change adds
commented examples to add such a network for the compute nodes in:
bond-with-vland, multiple-nics, single-nic-linux-bridge-vlans and
single-nic-vlans.

Change-Id: I4535cc5ea2556730f91362bd5f859e8700cd24f6

diff --git a/network/config/bond-with-vlans/compute.yaml b/network/config/bond-with-vlans/compute.yaml
index 448d4e2..1d62a5d 100644 (file)
--- a/network/config/bond-with-vlans/compute.yaml
+++ b/network/config/bond-with-vlans/compute.yaml
@@ -145,6 +145,12 @@ resources:
                   addresses:
                   - ip_netmask:
                       get_param: StorageIpSubnet
+                # Uncomment when including environments/hyperconverged-ceph.yaml
+                #- type: vlan
+                #  device: bond1
+                #  vlan_id: {get_param: StorageMgmtNetworkVlanID}
+                #  addresses:
+                #    - ip_netmask: {get_param: StorageMgmtIpSubnet}
                 - type: vlan
                   device: bond1
                   vlan_id:
@@ -155,16 +161,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
                 #  device: bond1
                 #  vlan_id: {get_param: ManagementNetworkVlanID}
                 #  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:

diff --git a/network/config/multiple-nics/compute.yaml b/network/config/multiple-nics/compute.yaml
index 5549368..d1dc06a 100644 (file)
--- a/network/config/multiple-nics/compute.yaml
+++ b/network/config/multiple-nics/compute.yaml
@@ -112,6 +112,12 @@ resources:
                 addresses:
                 - ip_netmask:
                     get_param: StorageIpSubnet
+              # Uncomment when including environments/hyperconverged-ceph.yaml
+              #- type: interface
+              #  name: nic3
+              #  use_dhcp: false
+              #  addresses:
+              #    - ip_netmask: {get_param: StorageMgmtIpSubnet}
               - type: interface
                 name: nic4
                 use_dhcp: false
@@ -132,16 +138,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: interface
+            #- type: interface
             #  name: nic7
             #  use_dhcp: false
             #  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:

diff --git a/network/config/single-nic-linux-bridge-vlans/compute.yaml b/network/config/single-nic-linux-bridge-vlans/compute.yaml
index e36afd3..a637ef0 100644 (file)
--- a/network/config/single-nic-linux-bridge-vlans/compute.yaml
+++ b/network/config/single-nic-linux-bridge-vlans/compute.yaml
@@ -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:

diff --git a/network/config/single-nic-vlans/compute.yaml b/network/config/single-nic-vlans/compute.yaml
index 2201b0b..d2559d2 100644 (file)
--- a/network/config/single-nic-vlans/compute.yaml
+++ b/network/config/single-nic-vlans/compute.yaml
@@ -38,6 +38,10 @@ parameters:
     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.
@@ -115,6 +119,11 @@ resources:
                   addresses:
                   - ip_netmask:
                       get_param: StorageIpSubnet
+                # Uncomment when including environments/hyperconverged-ceph.yaml
+                #- type: vlan
+                #  vlan_id: {get_param: StorageMgmtNetworkVlanID}
+                #  addresses:
+                #    - ip_netmask: {get_param: StorageMgmtIpSubnet}
                 - type: vlan
                   vlan_id:
                     get_param: TenantNetworkVlanID
@@ -124,15 +133,12 @@ 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}
                 #  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: