diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-07-01 14:22:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-07-01 14:22:46 +0000 |
| commit | 20536bc2e1eec5926df479d1fbc124df766b8ac0 (patch) | |
| tree | f0aa747fd1cad249e39fa6e4afa4e45d1aaa1116 /network/config | |
| parent | cdc74dc79d406b09900e1b69fe10ab5474cc4f6d (diff) | |
| parent | f08cc7ae12a55ae631097ea7557d3a32247bbd59 (diff) | |
Merge "Add a default route to the external isolated network"
Diffstat (limited to 'network/config')
| -rw-r--r-- | network/config/bond-with-vlans/controller.yaml | 16 | ||||
| -rw-r--r-- | network/config/single-nic-vlans/controller.yaml | 8 |
2 files changed, 20 insertions, 4 deletions
diff --git a/network/config/bond-with-vlans/controller.yaml b/network/config/bond-with-vlans/controller.yaml index 2498376d..9d6a6810 100644 --- a/network/config/bond-with-vlans/controller.yaml +++ b/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 diff --git a/network/config/single-nic-vlans/controller.yaml b/network/config/single-nic-vlans/controller.yaml index ca0cbcad..4cfa1317 100644 --- a/network/config/single-nic-vlans/controller.yaml +++ b/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} |