Merge "Add sample usage of StorageMgmt network for compute nodes"

This commit is contained in:
Jenkins 2017-07-07 18:22:23 +00:00 committed by Gerrit Code Review
commit b3a4a6e512
4 changed files with 39 additions and 24 deletions

View File

@ -143,6 +143,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:
@ -153,16 +159,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:

View File

@ -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:

View File

@ -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:

View File

@ -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: