Merge "Add {{ network.name }}_mtu for all networks to group_vars" into stable/victoria

This commit is contained in:
Zuul 2020-12-16 22:38:32 +00:00 committed by Gerrit Code Review
commit 3d4ee43fee
1 changed files with 8 additions and 1 deletions

View File

@ -996,13 +996,16 @@ resources:
- - default: true
next_hop: {get_attr: [Networks, net_attributes_map, ctlplane, subnets, {get_param: {{role.name}}ControlPlaneSubnet}, gateway_ip]}
{%- endif %}
# MTU is not filtered on role.networks, for DVR we need the External MTU on the exteranl_bridge
{% for network in networks if network.enabled|default(true) %}
{{network.name_lower}}_mtu: {get_attr: [Networks, net_attributes_map, {{network.name_lower}}, network, mtu]}
{%- endfor %}
{%- for network in networks if network.enabled|default(true) and network.name in role.networks|default([]) %}
{%- if role.networks is mapping %}
{%- set _role_net_subnet = role.networks[network.name]['subnet'] %}
{%- else %}
{%- set _role_net_subnet = network.name_lower + '_subnet' %}
{%- endif %}
{{network.name_lower}}_mtu: {get_attr: [Networks, net_attributes_map, {{network.name_lower}}, network, mtu]}
{{network.name_lower}}_gateway_ip: {get_attr: [Networks, net_attributes_map, {{network.name_lower}}, subnets, {{_role_net_subnet}}, gateway_ip]}
{{network.name_lower}}_host_routes:
list_concat_unique:
@ -1040,6 +1043,10 @@ resources:
{%- for network in networks if network.enabled|default(true) and network.name in role.networks|default([]) %}
{{network.name}}: {{network.name_lower}}
{%- endfor %}
networks_lower:
{%- for network in networks if network.enabled|default(true) %}
{{network.name}}: {{network.name_lower}}
{%- endfor %}
service_metadata_settings: {get_attr: [{{role.name}}ServiceChainRoleData, value, service_metadata_settings]}
tripleo_network_config_template: {get_param: {{role.name}}NetworkConfigTemplate}
tripleo_network_config_with_ansible: {get_param: NetworkConfigWithAnsible}