Merge "Correct jinja loop logic for role_networks"

environments/network-isolation-no-tunneling.j2.yaml

@@ -26,10 +26,10 @@ resource_registry:
 {#-     Convert net map or net list to internal list of networks #}
 {#-     NOTE(hjensas): For backward compatibility support role data with both #}
 {#-                    networks map (new schema) and network list (old schema). #}
-{%-     set _role_networks = [] %}
 {%-     if role.networks is mapping %}
-{%-         for key,val in role.networks.items() %}
-{%-             set _role_networks = _role_networks.append(key) %}
+{%-         set _role_networks = [] %}
+{%-         for key, val in role.networks.items() %}
+{%-             set _ = _role_networks.append(key) %}
 {%-         endfor %}
 {%-     else %}
 {%-         set _role_networks = role.networks %}

environments/network-isolation-v6.j2.yaml

@@ -33,10 +33,10 @@ resource_registry:
 {#-     Convert net map or net list to internal list of networks #}
 {#-     NOTE(hjensas): For backward compatibility support role data with both #}
 {#-                    networks map (new schema) and network list (old schema). #}
-{%-     set _role_networks = [] %}
 {%-     if role.networks is mapping %}
-{%-         for key,val in role.networks.items() %}
-{%-             set _role_networks = _role_networks.append(key) %}
+{%-         set _role_networks = [] %}
+{%-         for key, val in role.networks.items() %}
+{%-             set _ = _role_networks.append(key) %}
 {%-         endfor %}
 {%-     else %}
 {%-         set _role_networks = role.networks %}

environments/network-isolation.j2.yaml

@@ -22,10 +22,10 @@ resource_registry:
 {#-     Convert net map or net list to internal list of networks #}
 {#-     NOTE(hjensas): For backward compatibility support role data with both #}
 {#-                    networks map (new schema) and network list (old schema). #}
-{%-     set _role_networks = [] %}
 {%-     if role.networks is mapping %}
-{%-         for key,val in role.networks.items() %}
-{%-             set _role_networks = _role_networks.append(key) %}
+{%-         set _role_networks = [] %}
+{%-         for key, val in role.networks.items() %}
+{%-             set _ = _role_networks.append(key) %}
 {%-         endfor %}
 {%-     else %}
 {%-         set _role_networks = role.networks %}

network/config/2-linux-bonds-vlans/role.role.j2.yaml

@@ -1,10 +1,10 @@
 {#- Convert net map or net list to internal list of networks #}
 {#- NOTE(hjensas): For backward compatibility support role data with both #}
 {#-                networks map (new schema) and network list (old schema). #}
-{%- set _role_networks = [] %}
 {%- if role.networks is mapping %}
-{%-     for key,val in role.networks.items() %}
-{%-         set _role_networks = _role_networks.append(key) %}
+{%-     set _role_networks = [] %}
+{%-     for key, val in role.networks.items() %}
+{%-         set _ = _role_networks.append(key) %}
 {%-     endfor %}
 {%- else %}
 {%-     set _role_networks = role.networks %}

network/config/bond-with-vlans/role.role.j2.yaml

@@ -1,10 +1,10 @@
 {#- Convert net map or net list to internal list of networks #}
 {#- NOTE(hjensas): For backward compatibility support role data with both #}
 {#-                networks map (new schema) and network list (old schema). #}
-{%- set _role_networks = [] %}
 {%- if role.networks is mapping %}
-{%-     for key,val in role.networks.items() %}
-{%-         set _role_networks = _role_networks.append(key) %}
+{%-     set _role_networks = [] %}
+{%-     for key, val in role.networks.items() %}
+{%-         set _ = _role_networks.append(key) %}
 {%-     endfor %}
 {%- else %}
 {%-     set _role_networks = role.networks %}

network/config/multiple-nics/role.role.j2.yaml

@@ -1,10 +1,10 @@
 {#- Convert net map or net list to internal list of networks #}
 {#- NOTE(hjensas): For backward compatibility support role data with both #}
 {#-                networks map (new schema) and network list (old schema). #}
-{%- set _role_networks = [] %}
 {%- if role.networks is mapping %}
-{%-     for key,val in role.networks.items() %}
-{%-         set _role_networks = _role_networks.append(key) %}
+{%-     set _role_networks = [] %}
+{%-     for key, val in role.networks.items() %}
+{%-         set _ = _role_networks.append(key) %}
 {%-     endfor %}
 {%- else %}
 {%-     set _role_networks = role.networks %}

network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml

@@ -1,10 +1,10 @@
 {#- Convert net map or net list to internal list of networks #}
 {#- NOTE(hjensas): For backward compatibility support role data with both #}
 {#-                networks map (new schema) and network list (old schema). #}
-{%- set _role_networks = [] %}
 {%- if role.networks is mapping %}
-{%-     for key,val in role.networks.items() %}
-{%-         set _role_networks = _role_networks.append(key) %}
+{%-     set _role_networks = [] %}
+{%-     for key, val in role.networks.items() %}
+{%-         set _ = _role_networks.append(key) %}
 {%-     endfor %}
 {%- else %}
 {%-     set _role_networks = role.networks %}

network/config/single-nic-vlans/role.role.j2.yaml

@@ -1,10 +1,10 @@
 {#- Convert net map or net list to internal list of networks #}
 {#- NOTE(hjensas): For backward compatibility support role data with both #}
 {#-                networks map (new schema) and network list (old schema). #}
-{%- set _role_networks = [] %}
 {%- if role.networks is mapping %}
-{%-     for key,val in role.networks.items() %}
-{%-         set _role_networks = _role_networks.append(key) %}
+{%-     set _role_networks = [] %}
+{%-     for key, val in role.networks.items() %}
+{%-         set _ = _role_networks.append(key) %}
 {%-     endfor %}
 {%- else %}
 {%-     set _role_networks = role.networks %}