bundles/zfs: fix dependencies, auto-load zfs module if not loaded

bundles/zfs/items.py

@@ -3,7 +3,24 @@ from os.path import join
 
 from bundlewrap.metadata import MetadataJSONEncoder
 
-actions = {}
+actions = {
+    # For some reason, this module doesn't get auto-loaded on debian,
+    # even if installation of zfsutils-linux tries to start
+    # zfs-mount.service. We have no choice but to do it manually.
+    'modprobe_zfs': {
+        'command': 'modprobe zfs',
+        'unless': 'lsmod | grep ^zfs',
+        'needs': {
+            'pkg_apt:zfs-dkms',
+        },
+        'needed_by': {
+            'pkg_apt:zfs-zed',
+            'pkg_apt:zfsutils-linux',
+            'zfs_dataset:',
+            'zfs_pool:',
+        },
+    },
+}
 
 files = {
     '/etc/modprobe.d/zfs.conf': {

bundles/zfs/metadata.py

@@ -4,6 +4,11 @@ defaults = {
     'apt': {
         'packages': {
             'linux-headers-amd64': {
+                'needed_by': {
+                    'pkg_apt:zfs-dkms',
+                },
+            },
+            'zfs-dkms': {
                 'needed_by': {
                     'pkg_apt:zfs-zed',
                     'pkg_apt:zfsutils-linux',
@@ -61,22 +66,6 @@ defaults = {
     },
 }
 
-#if node.has_bundle('telegraf'):
-#    defaults.update({
-#        'telegraf': {
-#            'input_plugins': {
-#                'exec': {
-#                    'zfs_dataset': {
-#                        'command': 'telegraf-zfs-dataset',
-#                        'interval': '120s',
-#                    },
-#                },
-#                'zfs': {},
-#            },
-#        },
-#    })
-#    defaults['sudo']['verbatim'].add('telegraf ALL=(ALL) NOPASSWD:/sbin/zfs list *')
-
 if node.has_bundle('sshmon'):
     defaults.update({
         'icinga2_api': {