openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add a default route to the external isolated network"

Browse Source
This commit is contained in:
Jenkins 2015-07-01 14:22:46 +00:00 committed by Gerrit Code Review
commit 20536bc2e1
2 changed files with 20 additions and 4 deletions
network/config
bond-with-vlans
controller.yaml
single-nic-vlans
controller.yaml

16
network/config/bond-with-vlans/controller.yaml

@ -50,6 +50,10 @@ parameters:
default: 50
description: Vlan ID for the tenant network traffic.
type: number
ExternalInterfaceDefaultRoute:
default: '10.0.0.1'
description: default route for the external network
type: string
resources:
OsNetConfigImpl:
@ -61,11 +65,11 @@ resources:
network_config:
-
type: ovs_bridge
name: br-bond
name: {get_input: bridge_name}
members:
-
type: ovs_bond
name: {get_input: bridge_name}
name: bond1
ovs_options: {get_param: BondInterfaceOvsOptions}
members:
-
@ -80,8 +84,12 @@ resources:
device: bond1
vlan_id: {get_param: ExternalNetworkVlanID}
addresses:
-
ip_netmask: {get_param: ExternalIpSubnet}
-
ip_netmask: {get_param: ExternalIpSubnet}
routes:
-
ip_netmask: 0.0.0.0/0
next_hop: {get_param: ExternalInterfaceDefaultRoute}
-
type: vlan
device: bond1

8
network/config/single-nic-vlans/controller.yaml

@ -45,6 +45,10 @@ parameters:
default: 50
description: Vlan ID for the tenant network traffic.
type: number
ExternalInterfaceDefaultRoute:
default: '10.0.0.1'
description: default route for the external network
type: string
resources:
OsNetConfigImpl:
@ -70,6 +74,10 @@ resources:
addresses:
-
ip_netmask: {get_param: ExternalIpSubnet}
routes:
-
ip_netmask: 0.0.0.0/0
next_hop: {get_param: ExternalInterfaceDefaultRoute}
-
type: vlan
vlan_id: {get_param: InternalApiNetworkVlanID}