openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix multiple-nic sample template"

Browse Source
This commit is contained in:
Zuul 2018-11-10 06:58:43 +00:00 committed by Gerrit Code Review
commit c1bf5d8b10
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
network/config/multiple-nics/role.role.j2.yaml
View File

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