Fix multiple-nic sample template

Routes where only added to the External and Tenant interface.
This adds the routes also in the section setting up the nets
that are not External or Tenant

Closes-Bug: #1801916
Change-Id: Iec55e0c4ba27dc9a0003693850301804355433cc
This commit is contained in:
Harald Jensås 2018-10-26 22:25:37 +02:00
parent c6a5a6f345
commit dc2bec100f
1 changed files with 14 additions and 6 deletions

View File

@ -106,6 +106,14 @@ resources:
addresses:
- ip_netmask:
get_param: {{network.name}}IpSubnet
routes:
list_concat_unique:
- get_param: {{network.name}}InterfaceRoutes
{%- if network.name in role.default_route_networks %}
- - default: true
next_hop:
get_param: {{network.name}}InterfaceDefaultRoute
{%- endif %}
{%- endif %}
{%- elif network.name in role.networks or role.name == 'Networker' or role.name == 'ComputeDVR' %}
- type: ovs_bridge
@ -119,14 +127,14 @@ resources:
addresses:
- ip_netmask:
get_param: {{network.name}}IpSubnet
{%- endif %}
routes:
list_concat_unique:
- get_param: {{network.name}}InterfaceRoutes
list_concat_unique:
- get_param: {{network.name}}InterfaceRoutes
{%- if network.name in role.default_route_networks %}
- - default: true
next_hop:
get_param: {{network.name}}InterfaceDefaultRoute
- - default: true
next_hop:
get_param: {{network.name}}InterfaceDefaultRoute
{%- endif %}
{%- endif %}
members:
- type: interface