From c1fcfaf470886abcd257cca63b6b7d6d3db8fab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Thu, 19 Nov 2020 04:47:54 +0100 Subject: [PATCH] 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 3108c052b77e2c39246e9f55dc1a10069695ce0a) --- overcloud.j2.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index 25c5f5c14d..e0793f05c6 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -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}