Revert "bundles/systemd-networkd: fix vlan support for bridges and bonds"

This reverts commit 02146a81d6.

bundles/systemd-networkd/files/template-bond.network

@@ -3,7 +3,3 @@ Name=${' '.join(sorted(match))}
 
 [Network]
 Bond=${bond}
-
-% for vlan in sorted(vlans):
-VLAN=${bond}.${vlan}
-% endfor

bundles/systemd-networkd/files/template-bridge.network

@@ -4,7 +4,3 @@ Name=${' '.join(sorted(match))}
 [Network]
 Bridge=${bridge}
 BindCarrier=${' '.join(sorted(match))}
-
-% for vlan in sorted(vlans):
-VLAN=${bridge}.${vlan}
-% endfor

bundles/systemd-networkd/items.py

@@ -98,7 +98,6 @@ for bond, config in node.metadata.get('systemd-networkd/bonds', {}).items():
         'context': {
             'bond': bond,
             'match': config['match'],
-            'vlans': node.metadata.get(f'interfaces/{bond}/vlans', set()),
         },
         'needed_by': {
             'svc_systemd:systemd-networkd',
@@ -128,7 +127,6 @@ for brname, config in node.metadata.get('systemd-networkd/bridges', {}).items():
         'context': {
             'bridge': brname,
             'match': config['match'],
-            'vlans': node.metadata.get(f'interfaces/{brname}/vlans', set()),
         },
         'needed_by': {
             'svc_systemd:systemd-networkd',