Merge "Fix networks_skip_config condition in nic templates"

tripleo_ansible/roles/tripleo_network_config/molecule/default/molecule.yml

@@ -7,7 +7,7 @@ log: true
 platforms:
   - name: ubi8
     hostname: ubi8
-    image: ubi8/ubi-init
+    image: ubi8/ubi:8.2
     registry:
       url: registry.access.redhat.com
     dockerfile: Dockerfile

tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics/multiple_nics.j2

@@ -9,7 +9,7 @@ network_config:
   use_dhcp: false
   addresses:
   - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_subnet_cidr }}
-{% for network in role_networks and network not in networks_skip_config|default([]) %}
+{% for network in role_networks if network not in networks_skip_config %}
 {% if network not in ["External", "Tenant"] %}
 - type: interface
   name: nic{{ loop.index +1 }}

tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics/multiple_nics_dpdk.j2

@@ -10,7 +10,7 @@ network_config:
   addresses:
   - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_subnet_cidr }}
 {% set nics_used = [1] %}
-{% for network in role_networks and network not in networks_skip_config|default([]) %}
+{% for network in role_networks if network not in networks_skip_config %}
 {% if network not in ["External", "Tenant"] %}
 - type: interface
   name: nic{{ loop.index +1 }}

tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics/multiple_nics_dvr.j2

@@ -10,7 +10,7 @@ network_config:
   addresses:
   - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_subnet_cidr }}
 {% set nics_used = [1] %}
-{% for network in role_networks and network not in networks_skip_config|default([]) %}
+{% for network in role_networks if network not in networks_skip_config %}
 {% if network not in ["External", "Tenant"] %}
 - type: interface
   name: nic{{ loop.index +1 }}

tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics_vlans/multiple_nics_vlans.j2

@@ -9,7 +9,7 @@ network_config:
   use_dhcp: false
   addresses:
   - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_subnet_cidr }}
-{% for network in role_networks and network not in networks_skip_config|default([]) %}
+{% for network in role_networks if network not in networks_skip_config %}
 {% if network not in ["External", "Tenant"] %}
 - type: interface
   name: nic{{ loop.index + 1 }}

tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics_vlans/multiple_nics_vlans_dpdk.j2

@@ -10,7 +10,7 @@ network_config:
   addresses:
   - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_subnet_cidr }}
 {% set nics_used = [1] %}
-{% for network in role_networks and network not in networks_skip_config|default([]) %}
+{% for network in role_networks if network not in networks_skip_config %}
 {% if network not in ["External", "Tenant"] %}
 - type: interface
   name: nic{{ loop.index + 1 }}

tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics_vlans/multiple_nics_vlans_dvr.j2

@@ -10,7 +10,7 @@ network_config:
   addresses:
   - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_subnet_cidr }}
 {% set nics_used = [1] %}
-{% for network in role_networks and network not in networks_skip_config|default([]) %}
+{% for network in role_networks if network not in networks_skip_config %}
 {% if network not in ["External", "Tenant"] %}
 - type: interface
   name: nic{{ loop.index + 1 }}

tripleo_ansible/roles/tripleo_network_config/templates/single_nic_linux_bridge_vlans/single_nic_linux_bridge_vlans.j2

@@ -20,7 +20,7 @@ network_config:
     mtu: {{ min_viable_mtu }}
     # force the MAC address of the bridge to this interface
     primary: true
-{% for network in role_networks and network not in networks_skip_config|default([]) %}
+{% 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') }}

tripleo_ansible/roles/tripleo_network_config/templates/single_nic_linux_bridge_vlans/single_nic_linux_bridge_vlans_storage.j2

@@ -20,7 +20,7 @@ network_config:
     mtu: {{ min_viable_mtu }}
     # force the MAC address of the bridge to this interface
     primary: true
-{% for network in role_networks and network not in networks_skip_config|default([]) %}
+{% 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') }}

tripleo_ansible/roles/tripleo_network_config/templates/single_nic_vlans/controller_no_external.j2

@@ -20,7 +20,7 @@ network_config:
     mtu: {{ min_viable_mtu }}
     # force the MAC address of the bridge to this interface
     primary: true
-{% for network in role_networks and network != 'External' %}
+{% 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') }}