diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-08-25 00:52:55 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-08-25 00:52:55 +0000 |
commit | e22fa39e7855b2763726340ec74ea18efb91af9c (patch) | |
tree | 52683e0442e142d069a0b9871e1c2a584da31b14 /network/config/single-nic-vlans/controller.yaml | |
parent | a6044b2ba9933e05b7b4685c4863c70410238bfe (diff) | |
parent | 5aabce1091cbb73887914d6900f06d5a5069d97c (diff) |
Merge "Updates and fixes to NIC config template routes"
Diffstat (limited to 'network/config/single-nic-vlans/controller.yaml')
-rw-r--r-- | network/config/single-nic-vlans/controller.yaml | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/network/config/single-nic-vlans/controller.yaml b/network/config/single-nic-vlans/controller.yaml index a5a0745d..c5979a89 100644 --- a/network/config/single-nic-vlans/controller.yaml +++ b/network/config/single-nic-vlans/controller.yaml @@ -57,10 +57,17 @@ parameters: default: 60 description: Vlan ID for the management network traffic. type: number + ControlPlaneDefaultRoute: # Override this via parameter_defaults + description: The default route of the control plane network. + type: string ExternalInterfaceDefaultRoute: default: '10.0.0.1' description: default route for the external network type: string + ManagementInterfaceDefaultRoute: # Commented out by default in this template + default: unset + description: The default route of the management network. + type: string ControlPlaneSubnetCidr: # Override this via parameter_defaults default: '24' description: The subnet CIDR of the control plane network. @@ -137,12 +144,20 @@ resources: addresses: - ip_netmask: {get_param: TenantIpSubnet} - #- # Uncomment when including environments/network-management.yaml + # Uncomment when including environments/network-management.yaml + # If setting default route on the Management interface, comment + # out the default route on the External interface. This will + # make the External API unreachable from remote subnets. + #- # type: vlan # vlan_id: {get_param: ManagementNetworkVlanID} # addresses: # - # ip_netmask: {get_param: ManagementIpSubnet} + # routes: + # - + # default: true + # next_hop: {get_param: ManagementInterfaceDefaultRoute} outputs: OS::stack_id: |