bundles/kea-dhcpd/items.py

@@ -15,7 +15,7 @@ svc_systemd = {
         'needs': [
             'pkg_apt:kea-dhcp4-server',
             'file:/etc/kea/kea-dhcp4.conf',
-            'svc_systemd:systemd-networkd.service:restart',
+            'svc_systemd:systemd-networkd:restart',
         ],
     },
 }

bundles/mariadb/metadata.py

@@ -3,12 +3,12 @@ defaults = {
         'packages': {
             'mariadb-server': {
                 'needs': {
-                    #'zfs_dataset:tank/mariadb',
+                    'zfs_dataset:tank/mariadb',
                 },
             },
             'mariadb-client': {
                 'needs': {
-                    #'zfs_dataset:tank/mariadb',
+                    'zfs_dataset:tank/mariadb',
                 },
             },
         },

bundles/systemd-networkd/items.py

@@ -19,6 +19,5 @@ directories = {
 }
 
 svc_systemd = {
-    'systemd-networkd.service': {},
+    'systemd-networkd': {},
 }
-

bundles/systemd/items.py

@@ -24,10 +24,10 @@ for name, unit in node.metadata.get('systemd/units').items():
         path = f'/etc/systemd/network/{name}'
         dependencies = {
             'needed_by': [
-                'svc_systemd:systemd-networkd.service',
+                'svc_systemd:systemd-networkd',
             ],
             'triggers': [
-                'svc_systemd:systemd-networkd.service:restart',
+                'svc_systemd:systemd-networkd:restart',
             ],
         }
     elif extension in ['timer', 'service', 'mount', 'swap', 'target']:

bundles/wireguard/metadata.py

@@ -12,7 +12,7 @@ defaults = {
             'wireguard': {
                 'backports': node.os_version < (11,),
                 'triggers': [
-                    'svc_systemd:systemd-networkd.service:restart',
+                    'svc_systemd:systemd-networkd:restart',
                 ],
             },
         },