From 2018260328108d4b21563a587f8891fc3ccaafdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Harald=20Jens=C3=A5s?= <hjensas@redhat.com>
Date: Thu, 19 Nov 2020 15:12:17 +0100
Subject: [PATCH] Drop use of role_networks_lower

This is a follow up to https://review.opendev.org/763302
replacing the use of role_networks_lower in all the
templates.

Change-Id: Ia55b1de0a1a8c03b33a40f8c524c2a3b0f45f1b8
Related-Bug: #1904809
---
 .../2_linux_bonds_vlans.j2                    | 20 ++++++++--------
 .../2_linux_bonds_vlans_dpdk.j2               | 18 +++++++-------
 .../templates/bonds_vlans/bonds_vlans.j2      | 10 ++++----
 .../templates/bonds_vlans/bonds_vlans_dpdk.j2 | 10 ++++----
 .../bonds_vlans/bonds_vlans_storage.j2        | 10 ++++----
 .../templates/multiple_nics/multiple_nics.j2  | 16 ++++++-------
 .../multiple_nics/multiple_nics_dpdk.j2       | 16 ++++++-------
 .../multiple_nics_vlans.j2                    | 24 +++++++++----------
 .../multiple_nics_vlans_dpdk.j2               | 24 +++++++++----------
 .../single_nic_linux_bridge_vlans.j2          | 10 ++++----
 .../single_nic_linux_bridge_vlans_storage.j2  | 10 ++++----
 .../controller_no_external.j2                 | 10 ++++----
 .../single_nic_vlans/single_nic_vlans.j2      | 10 ++++----
 .../single_nic_vlans_storage.j2               | 10 ++++----
 14 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/tripleo_ansible/roles/tripleo_network_config/templates/2_linux_bonds_vlans/2_linux_bonds_vlans.j2 b/tripleo_ansible/roles/tripleo_network_config/templates/2_linux_bonds_vlans/2_linux_bonds_vlans.j2
index 6eea9a5c5..0c40333df 100644
--- a/tripleo_ansible/roles/tripleo_network_config/templates/2_linux_bonds_vlans/2_linux_bonds_vlans.j2
+++ b/tripleo_ansible/roles/tripleo_network_config/templates/2_linux_bonds_vlans/2_linux_bonds_vlans.j2
@@ -8,14 +8,14 @@
 {# The bridge, bond or interface must have an MTU to allow the VLAN with the #}
 {# largest MTU. #}
 {% if network.startswith('Tenant') %}
-{{ mtu_dataplane_list.append(lookup('vars', role_networks_lower[network] ~ '_mtu')) }}
+{{ mtu_dataplane_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
 {# This block resolves the minimum viable MTU for interfaces connected to #}
 {# the control plane network(s) (don't start by "Tenant"), and also bonds #}
 {# and bridges that carry multiple VLANs. Each VLAN may have different MTU. #}
 {# The bridge, bond or interface must have an MTU to allow the VLAN with the #}
 {# largest MTU. #}
 {% else %}
-{{ mtu_ctlplane_list.append(lookup('vars', role_networks_lower[network] ~ '_mtu')) }}
+{{ mtu_ctlplane_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
 {%- endfor %}
 {% set min_viable_mtu_ctlplane = mtu_ctlplane_list | max %}
 {% set min_viable_mtu_dataplane = mtu_dataplane_list | max %}
@@ -45,11 +45,11 @@ network_config:
 {% for network in role_networks if not network.startswith('Tenant') %}
 - type: vlan
   device: bond_api
-  mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
-  vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }}
+  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+  vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
   addresses:
-  - ip_netmask: {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-  routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+  - ip_netmask: {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+  routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
 {% endfor %}
 - type: ovs_bridge
   name: {{ neutron_physical_bridge_name }}
@@ -70,9 +70,9 @@ network_config:
 {% for network in role_networks if network.startswith('Tenant') %}
 - type: vlan
   device: bond-data
-  mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
-  vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }}
+  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+  vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
   addresses:
-  - ip_netmask: {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-  routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+  - ip_netmask: {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+  routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
 {%- endfor %}
diff --git a/tripleo_ansible/roles/tripleo_network_config/templates/2_linux_bonds_vlans/2_linux_bonds_vlans_dpdk.j2 b/tripleo_ansible/roles/tripleo_network_config/templates/2_linux_bonds_vlans/2_linux_bonds_vlans_dpdk.j2
index 7b61e774a..0b5c11a17 100644
--- a/tripleo_ansible/roles/tripleo_network_config/templates/2_linux_bonds_vlans/2_linux_bonds_vlans_dpdk.j2
+++ b/tripleo_ansible/roles/tripleo_network_config/templates/2_linux_bonds_vlans/2_linux_bonds_vlans_dpdk.j2
@@ -6,7 +6,7 @@
 {% set mtu_list = [] %}
 {{ mtu_list.append(lookup('vars', ctlplane_mtu)) }}
 {% for network in role_networks %}
-{{ mtu_list.append(lookup('vars', role_networks_lower[network] ~ '_mtu')) }}
+{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
 {%- endfor %}
 {% set min_viable_mtu = mtu_list | max %}
 network_config:
@@ -35,24 +35,24 @@ network_config:
 {% for network in role_networks if not network.startswith('Tenant') %}
 - type: vlan
   device: bond_api
-  mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
-  vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }}
+  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+  vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
   addresses:
-  - ip_netmask: {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-  routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+  - ip_netmask: {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+  routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
 {% endfor %}
 {# Special config for OVS DPDK #}
 - type: ovs_user_bridge
   name: br-dpdk0
   use_dhcp: false
 {% for network in role_networks if network.startswith('Tenant') %}
-  ovs_extra: "set port br-dpdk0 tag={{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }}"
+  ovs_extra: "set port br-dpdk0 tag={{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}"
   addresses:
-  - ip_netmask: {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr')}}
+  - ip_netmask: {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr')}}
 {% if default_route_networks and network in default_route_networks %}
-  routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') + [{'default': true, 'next_hop': lookup('vars', role_networks_lower[network] ~ '_gateway_ip')}] }}
+  routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') + [{'default': true, 'next_hop': lookup('vars', networks_lower[network] ~ '_gateway_ip')}] }}
 {% else %}
-  routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+  routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
 {% endif %}
 {%- endfor %}
   members:
diff --git a/tripleo_ansible/roles/tripleo_network_config/templates/bonds_vlans/bonds_vlans.j2 b/tripleo_ansible/roles/tripleo_network_config/templates/bonds_vlans/bonds_vlans.j2
index e171816bc..d8902099b 100644
--- a/tripleo_ansible/roles/tripleo_network_config/templates/bonds_vlans/bonds_vlans.j2
+++ b/tripleo_ansible/roles/tripleo_network_config/templates/bonds_vlans/bonds_vlans.j2
@@ -1,7 +1,7 @@
 ---
 {% set mtu_list = [ctlplane_mtu] %}
 {% for network in role_networks %}
-{{ mtu_list.append(lookup('vars', role_networks_lower[network] ~ '_mtu')) }}
+{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
 {%- endfor %}
 {% set min_viable_mtu = mtu_list | max %}
 network_config:
@@ -31,9 +31,9 @@ network_config:
       mtu: {{ min_viable_mtu }}
 {% for network in role_networks %}
   - type: vlan
-    mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
-    vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }}
+    mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+    vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
     addresses:
-    - ip_netmask: {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-    routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+    - ip_netmask: {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+    routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
 {%- endfor %}
diff --git a/tripleo_ansible/roles/tripleo_network_config/templates/bonds_vlans/bonds_vlans_dpdk.j2 b/tripleo_ansible/roles/tripleo_network_config/templates/bonds_vlans/bonds_vlans_dpdk.j2
index aa1b2a465..f16adfcdb 100644
--- a/tripleo_ansible/roles/tripleo_network_config/templates/bonds_vlans/bonds_vlans_dpdk.j2
+++ b/tripleo_ansible/roles/tripleo_network_config/templates/bonds_vlans/bonds_vlans_dpdk.j2
@@ -1,7 +1,7 @@
 ---
 {% set mtu_list = [ctlplane_mtu] %}
 {% for network in role_networks %}
-{{ mtu_list.append(lookup('vars', role_networks_lower[network] ~ '_mtu')) }}
+{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
 {%- endfor %}
 {% set min_viable_mtu = mtu_list | max %}
 network_config:
@@ -29,11 +29,11 @@ network_config:
 {% for network in role_networks %}
 - type: vlan
   device: bond_api
-  mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
-  vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }}
+  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+  vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
   addresses:
-  - ip_netmask: {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-  routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+  - ip_netmask: {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+  routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
 {%- endfor %}
 {# Used as a provider network with external DHCP #}
 - type: ovs_user_bridge
diff --git a/tripleo_ansible/roles/tripleo_network_config/templates/bonds_vlans/bonds_vlans_storage.j2 b/tripleo_ansible/roles/tripleo_network_config/templates/bonds_vlans/bonds_vlans_storage.j2
index de7db09b0..fd8a0b162 100644
--- a/tripleo_ansible/roles/tripleo_network_config/templates/bonds_vlans/bonds_vlans_storage.j2
+++ b/tripleo_ansible/roles/tripleo_network_config/templates/bonds_vlans/bonds_vlans_storage.j2
@@ -1,7 +1,7 @@
 ---
 {% set mtu_list = [ctlplane_mtu] %}
 {% for network in role_networks %}
-{{ mtu_list.append(lookup('vars', role_networks_lower[network] ~ '_mtu')) }}
+{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
 {%- endfor %}
 {% set min_viable_mtu = mtu_list | max %}
 network_config:
@@ -31,9 +31,9 @@ network_config:
       mtu: {{ min_viable_mtu }}
 {% for network in role_networks %}
   - type: vlan
-    mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
-    vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }}
+    mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+    vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
     addresses:
-    - ip_netmask: {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-    routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+    - ip_netmask: {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+    routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
 {%- endfor %}
diff --git a/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics/multiple_nics.j2 b/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics/multiple_nics.j2
index 4febacaef..8c41d95b1 100644
--- a/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics/multiple_nics.j2
+++ b/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics/multiple_nics.j2
@@ -13,30 +13,30 @@ network_config:
 {% if network not in ["External", "Tenant"] %}
 - type: interface
   name: nic{{ loop.index +1 }}
-  mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
+  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
   use_dhcp: false
   addresses:
   - ip_netmask:
-      {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-  routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+      {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+  routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
 {% elif 'external_bridge' in role_tags %}
 - type: ovs_bridge
 {% if network == 'External' %}
   name: {{ neutron_physical_bridge_name }}
 {% else %}
-  name: {{ 'br-' ~ role_networks_lower[network] }}
+  name: {{ 'br-' ~ networks_lower[network] }}
 {% endif %}
-  mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
+  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
   dns_servers: {{ ctlplane_dns_nameservers }}
   use_dhcp: false
   addresses:
   - ip_netmask:
-      {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-  routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+      {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+  routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
   members:
   - type: interface
     name: nic{{loop.index + 1}}
-    mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
+    mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
     use_dhcp: false
     primary: true
 {% endif %}
diff --git a/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics/multiple_nics_dpdk.j2 b/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics/multiple_nics_dpdk.j2
index b39f5b703..695609f18 100644
--- a/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics/multiple_nics_dpdk.j2
+++ b/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics/multiple_nics_dpdk.j2
@@ -14,30 +14,30 @@ network_config:
 {% if network not in ["External", "Tenant"] %}
 - type: interface
   name: nic{{ loop.index +1 }}
-  mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
+  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
   use_dhcp: false
   addresses:
   - ip_netmask:
-      {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-  routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+      {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+  routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
 {% elif 'external_bridge' in role_tags %}
 - type: ovs_bridge
 {% if network == 'External' %}
   name: {{ neutron_physical_bridge_name }}
 {% else %}
-  name: {{ 'br-' ~ role_networks_lower[network] }}
+  name: {{ 'br-' ~ networks_lower[network] }}
 {% endif %}
-  mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
+  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
   dns_servers: {{ ctlplane_dns_nameservers }}
   use_dhcp: false
   addresses:
   - ip_netmask:
-      {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-  routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+      {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+  routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
   members:
   - type: interface
     name: nic{{loop.index + 1}}
-    mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
+    mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
     use_dhcp: false
     primary: true
 {% endif %}
diff --git a/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics_vlans/multiple_nics_vlans.j2 b/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics_vlans/multiple_nics_vlans.j2
index d1ed4c56b..19de35943 100644
--- a/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics_vlans/multiple_nics_vlans.j2
+++ b/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics_vlans/multiple_nics_vlans.j2
@@ -13,38 +13,38 @@ network_config:
 {% if network not in ["External", "Tenant"] %}
 - type: interface
   name: nic{{ loop.index + 1 }}
-  mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
+  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
   use_dhcp: false
 - type: vlan
   device: nic{{ loop.index + 1 }}
-  mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
-  vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }}
+  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+  vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
   addresses:
   - ip_netmask:
-      {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-  routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+      {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+  routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
 {% elif 'external_bridge' in role_tags %}
 - type: ovs_bridge
 {% if network == 'External' %}
   name: {{ neutron_physical_bridge_name }}
 {% else %}
-  name: {{ 'br-' ~ role_networks_lower[network] }}
+  name: {{ 'br-' ~ networks_lower[network] }}
 {% endif %}
-  mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
+  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
   dns_servers: {{ ctlplane_dns_nameservers }}
   use_dhcp: false
   members:
   - type: interface
     name: nic{{ loop.index + 1 }}
-    mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
+    mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
     use_dhcp: false
     primary: true
   - type: vlan
-    mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
-    vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }}
+    mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+    vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
     addresses:
     - ip_netmask:
-        {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-    routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+        {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+    routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
 {% endif %}
 {% endfor %}
diff --git a/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics_vlans/multiple_nics_vlans_dpdk.j2 b/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics_vlans/multiple_nics_vlans_dpdk.j2
index 86ed61a50..d39cdd2d3 100644
--- a/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics_vlans/multiple_nics_vlans_dpdk.j2
+++ b/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics_vlans/multiple_nics_vlans_dpdk.j2
@@ -14,39 +14,39 @@ network_config:
 {% if network not in ["External", "Tenant"] %}
 - type: interface
   name: nic{{ loop.index + 1 }}
-  mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
+  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
   use_dhcp: false
 - type: vlan
   device: nic{{ loop.index + 1 }}
-  mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
-  vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }}
+  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+  vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
   addresses:
   - ip_netmask:
-      {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-  routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+      {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+  routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
 {% elif 'external_bridge' in role_tags %}
 - type: ovs_bridge
 {% if network == 'External' %}
   name: {{ neutron_physical_bridge_name }}
 {% else %}
-  name: {{ 'br-' ~ role_networks_lower[network] }}
+  name: {{ 'br-' ~ networks_lower[network] }}
 {% endif %}
-  mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
+  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
   dns_servers: {{ ctlplane_dns_nameservers }}
   use_dhcp: false
   members:
   - type: interface
     name: nic{{ loop.index + 1 }}
-    mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
+    mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
     use_dhcp: false
     primary: true
   - type: vlan
-    mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
-    vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }}
+    mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+    vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
     addresses:
     - ip_netmask:
-        {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-    routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+        {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+    routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
 {% endif %}
 {% set _ = nics_used.append(loop.index) %}
 {% endfor %}
diff --git a/tripleo_ansible/roles/tripleo_network_config/templates/single_nic_linux_bridge_vlans/single_nic_linux_bridge_vlans.j2 b/tripleo_ansible/roles/tripleo_network_config/templates/single_nic_linux_bridge_vlans/single_nic_linux_bridge_vlans.j2
index 11bfe01ac..e4784905b 100644
--- a/tripleo_ansible/roles/tripleo_network_config/templates/single_nic_linux_bridge_vlans/single_nic_linux_bridge_vlans.j2
+++ b/tripleo_ansible/roles/tripleo_network_config/templates/single_nic_linux_bridge_vlans/single_nic_linux_bridge_vlans.j2
@@ -1,7 +1,7 @@
 ---
 {% set mtu_list = [ctlplane_mtu] %}
 {% for network in role_networks %}
-{{ mtu_list.append(lookup('vars', role_networks_lower[network] ~ '_mtu')) }}
+{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
 {%- endfor %}
 {% set min_viable_mtu = mtu_list | max %}
 network_config:
@@ -22,11 +22,11 @@ network_config:
     primary: true
 {% for network in role_networks if network not in networks_skip_config %}
   - type: vlan
-    mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
-    vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }}
+    mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+    vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
     device: {{ neutron_physical_bridge_name }}
     addresses:
     - ip_netmask:
-        {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-    routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+        {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+    routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
 {% endfor %}
diff --git a/tripleo_ansible/roles/tripleo_network_config/templates/single_nic_linux_bridge_vlans/single_nic_linux_bridge_vlans_storage.j2 b/tripleo_ansible/roles/tripleo_network_config/templates/single_nic_linux_bridge_vlans/single_nic_linux_bridge_vlans_storage.j2
index f6c7f176c..c573f0703 100644
--- a/tripleo_ansible/roles/tripleo_network_config/templates/single_nic_linux_bridge_vlans/single_nic_linux_bridge_vlans_storage.j2
+++ b/tripleo_ansible/roles/tripleo_network_config/templates/single_nic_linux_bridge_vlans/single_nic_linux_bridge_vlans_storage.j2
@@ -1,7 +1,7 @@
 ---
 {% set mtu_list = [ctlplane_mtu] %}
 {% for network in role_networks %}
-{{ mtu_list.append(lookup('vars', role_networks_lower[network] ~ '_mtu')) }}
+{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
 {%- endfor %}
 {% set min_viable_mtu = mtu_list | max %}
 network_config:
@@ -22,11 +22,11 @@ network_config:
     primary: true
 {% for network in role_networks if network not in networks_skip_config) %}
   - type: vlan
-    mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
-    vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }}
+    mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+    vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
     device: br-storage
     addresses:
     - ip_netmask:
-        {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-    routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+        {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+    routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
 {% endfor %}
diff --git a/tripleo_ansible/roles/tripleo_network_config/templates/single_nic_vlans/controller_no_external.j2 b/tripleo_ansible/roles/tripleo_network_config/templates/single_nic_vlans/controller_no_external.j2
index 8eed8c8ef..ef31c9ed0 100644
--- a/tripleo_ansible/roles/tripleo_network_config/templates/single_nic_vlans/controller_no_external.j2
+++ b/tripleo_ansible/roles/tripleo_network_config/templates/single_nic_vlans/controller_no_external.j2
@@ -1,7 +1,7 @@
 ---
 {% set mtu_list = [ctlplane_mtu] %}
 {% for network in role_networks %}
-{{ mtu_list.append(lookup('vars', role_networks_lower[network] ~ '_mtu')) }}
+{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
 {%- endfor %}
 {% set min_viable_mtu = mtu_list | max %}
 network_config:
@@ -22,10 +22,10 @@ network_config:
     primary: true
 {% for network in role_networks if network != 'External' %}
   - type: vlan
-    mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
-    vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }}
+    mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+    vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
     addresses:
     - ip_netmask:
-        {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-    routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+        {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+    routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
 {% endfor %}
diff --git a/tripleo_ansible/roles/tripleo_network_config/templates/single_nic_vlans/single_nic_vlans.j2 b/tripleo_ansible/roles/tripleo_network_config/templates/single_nic_vlans/single_nic_vlans.j2
index 3688909e3..5e7cebd99 100644
--- a/tripleo_ansible/roles/tripleo_network_config/templates/single_nic_vlans/single_nic_vlans.j2
+++ b/tripleo_ansible/roles/tripleo_network_config/templates/single_nic_vlans/single_nic_vlans.j2
@@ -1,7 +1,7 @@
 ---
 {% set mtu_list = [ctlplane_mtu] %}
 {% for network in role_networks %}
-{{ mtu_list.append(lookup('vars', role_networks_lower[network] ~ '_mtu')) }}
+{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
 {%- endfor %}
 {% set min_viable_mtu = mtu_list | max %}
 network_config:
@@ -22,10 +22,10 @@ network_config:
     primary: true
 {% for network in role_networks %}
   - type: vlan
-    mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
-    vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }}
+    mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+    vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
     addresses:
     - ip_netmask:
-        {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-    routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+        {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+    routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
 {% endfor %}
diff --git a/tripleo_ansible/roles/tripleo_network_config/templates/single_nic_vlans/single_nic_vlans_storage.j2 b/tripleo_ansible/roles/tripleo_network_config/templates/single_nic_vlans/single_nic_vlans_storage.j2
index 4a4da65e6..d218c338b 100644
--- a/tripleo_ansible/roles/tripleo_network_config/templates/single_nic_vlans/single_nic_vlans_storage.j2
+++ b/tripleo_ansible/roles/tripleo_network_config/templates/single_nic_vlans/single_nic_vlans_storage.j2
@@ -1,7 +1,7 @@
 ---
 {% set mtu_list = [ctlplane_mtu] %}
 {% for network in role_networks %}
-{{ mtu_list.append(lookup('vars', role_networks_lower[network] ~ '_mtu')) }}
+{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
 {%- endfor %}
 {% set min_viable_mtu = mtu_list | max %}
 network_config:
@@ -22,10 +22,10 @@ network_config:
     primary: true
 {% for network in role_networks %}
   - type: vlan
-    mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }}
-    vlan_id: {{ lookup('vars', role_networks_lower[network] ~ '_vlan_id') }}
+    mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+    vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
     addresses:
     - ip_netmask:
-        {{ lookup('vars', role_networks_lower[network] ~ '_ip') }}/{{ lookup('vars', role_networks_lower[network] ~ '_cidr') }}
-    routes: {{ lookup('vars', role_networks_lower[network] ~ '_host_routes') }}
+        {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+    routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
 {% endfor %}