openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Add {{ network.name }}_mtu for all networks to group_vars 

For DVR the external bridge is needed also on compute nodes
where there is no 'External' network associated witht the
role. Compute nodes running DVR need the MTU to properly
configured.

Also create a 'network_lower' group_var mapping all
'network.name' to 'network.name_lower'.

NOTE: A follow up can deprecate 'role_networks_lower' once
all Ansible templates are updated to use the 'network_lower'
map.

Related-Bug: #1904809
Change-Id: I5e106874b7809b3b0b8265615863a9b9d35d7c44
(cherry picked from commit 3108c052b7)
This commit is contained in:
Harald Jensås 2020-11-19 04:47:54 +01:00 committed by Rabi Mishra
parent 125d41b857
commit c1fcfaf470
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
overcloud.j2.yaml
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}