From 488b894bffdeb108669f178842761e2685cddff0 Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Mon, 5 Dec 2016 02:05:06 +0100
Subject: 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
---
 network/config/single-nic-vlans/compute.yaml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'network/config/single-nic-vlans/compute.yaml')

diff --git a/network/config/single-nic-vlans/compute.yaml b/network/config/single-nic-vlans/compute.yaml
index 2201b0b9..d2559d2c 100644
--- 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:
-- 
cgit 1.2.3-korg