networkd: make VLANs more versatile

networkd/tasks/vlan.yml

@@ -34,7 +34,7 @@
     group: root
     mode: '0644'
   with_items: "{{ vlan.vlans }}"
-  when: item.bridge
+  when: item.bridge | default(False)
   notify:
     - restart networkd
 - name: ensure bridge networks are configured
@@ -45,6 +45,6 @@
     group: root
     mode: '0644'
   with_items: "{{ vlan.vlans }}"
-  when: item.bridge
+  when: item.bridge | default(False)
   notify:
     - restart networkd

networkd/templates/20-wired-routed.network.j2

@@ -22,6 +22,9 @@ IPForward=yes
 {% for key, value in (network.settings|default({})).items() %}
 {{ key }}={{ value }}
 {% endfor %}
+{% for vlan in network.vlans|default([]) %}
+VLAN=vl-{{ vlan.name }}
+{% endfor %}
 
 {% for route in network.routes|default([{'gateway': network.gateway}]) %}
 [Route]

networkd/templates/20-wired-vlan.network.j2

+{% if item.1.addresses | default(False) %}
+{% set network = item.1 %}
+{% include "20-wired-routed.network.j2" %}
+{% else %}
 [Match]
 Name={{ item.1.interface }}
 
@@ -9,3 +13,4 @@ BindCarrier={{ item.1.interface }}
 {% if networkd_ipfwd %}
 IPForward=yes
 {% endif %}
+{% endif %}

networkd/templates/vlan.network.j2

-{% if item.bridge %}
+{% if item.bridge | default(False) %}
 [Match]
 Name=vl-{{ item.name }}
 
@@ -10,7 +10,9 @@ Bridge=vmbr-{{ item.name }}
 	'addresses': item.addresses|default([item.address] if item.address is defined else []),
 	'nameservers': item.nameservers|default([]),
 	'routes': item.routes|default([{'gateway': item.gateway}] if item.gateway is defined else []),
-	'link_local_addressing': item.link_local_addressing|default(None)
+	'link_local_addressing': item.link_local_addressing|default(None),
+	'settings': item.settings|default({}),
+	'custom': item.custom|default([])
 	} %}
 {% include "20-wired-routed.network.j2" %}
 {% endif %}