aboutsummaryrefslogtreecommitdiffstats
path: root/network/config/single-nic-vlans/compute.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-23 17:27:25 +0000
committerGerrit Code Review <review@openstack.org>2015-12-23 17:27:25 +0000
commit2a05569f0261509fcb3f411917c8863f53ca78d7 (patch)
tree46ad07e61c44a5d17797f674c9b0866bca20818c /network/config/single-nic-vlans/compute.yaml
parentc40f2a3b67274e9c7133ce9fd44d8635a8aa4674 (diff)
parent15bb67261a333f140f21208e20a112b99eeb609c (diff)
Merge "Add Management Network For System Administration."
Diffstat (limited to 'network/config/single-nic-vlans/compute.yaml')
-rw-r--r--network/config/single-nic-vlans/compute.yaml15
1 files changed, 15 insertions, 0 deletions
diff --git a/network/config/single-nic-vlans/compute.yaml b/network/config/single-nic-vlans/compute.yaml
index 4e93b31c..8cf6825d 100644
--- a/network/config/single-nic-vlans/compute.yaml
+++ b/network/config/single-nic-vlans/compute.yaml
@@ -29,6 +29,10 @@ parameters:
default: ''
description: IP address/subnet on the tenant network
type: string
+ ManagementIpSubnet: # Only populated when including environments/network-management.yaml
+ default: ''
+ description: IP address/subnet on the management network
+ type: string
InternalApiNetworkVlanID:
default: 20
description: Vlan ID for the internal_api network traffic.
@@ -41,6 +45,10 @@ parameters:
default: 50
description: Vlan ID for the tenant network traffic.
type: number
+ ManagementNetworkVlanID:
+ default: 60
+ description: Vlan ID for the management network traffic.
+ type: number
ControlPlaneSubnetCidr: # Override this via parameter_defaults
default: '24'
description: The subnet CIDR of the control plane network.
@@ -107,6 +115,13 @@ resources:
addresses:
-
ip_netmask: {get_param: TenantIpSubnet}
+ # Uncomment when including environments/network-management.yaml
+ #-
+ # type: vlan
+ # vlan_id: {get_param: ManagementNetworkVlanID}
+ # addresses:
+ # -
+ # ip_netmask: {get_param: ManagementIpSubnet}
outputs:
OS::stack_id: