linux-zfs: Use Debian-native ZFS packages

diff --git a/roles/linux-zfs/tasks/main.yml b/roles/linux-zfs/tasks/main.yml
index d4d3578f11545397b759d8c2419be35870db601e..7bbf26af3b6d45036148eaa26cbff777a5e65472 100644 (file)
--- a/roles/linux-zfs/tasks/main.yml
+++ b/roles/linux-zfs/tasks/main.yml
@@ -1,29 +1,16 @@
 ---
 # tasks file for linux-zfs
 
-- name: install "ZFS on Linux" repository GnuPG key
+- name: remove outdated "ZFS on Linux" repository configuration
   tags:
     - zfs
     - packages
-  copy: >
-    dest=/etc/apt/trusted.gpg.d/
-    group=root
-    mode=644
-    owner=root
-    src=zfsonlinux.gpg
-  notify:
-    - update APT repositories
-
-- name: install "ZFS on Linux" repository configuration
-  tags:
-    - zfs
-    - packages
-  template: >
-    dest=/etc/apt/sources.list.d/zfsonlinux.list
-    group=root
-    mode=644
-    owner=root
-    src=zfsonlinux.list.j2
+  file: >
+    name={{ item }}
+    state=absent
+  with_items:
+    - /etc/apt/trusted.gpg.d/zfsonlinux.gpg
+    - /etc/apt/sources.list.d/zfsonlinux.list
   notify:
     - update APT repositories
 
@@ -32,21 +19,13 @@
     - zfs
     - packages
 
-- name: install "build-essential" package
-  tags:
-    - packages
-    - zfs
-  apt: >
-    state=installed
-    name=build-essential
-
-- name: install "ZFS on Linux" packages
+- name: install ZFS packages
   tags:
     - packages
     - zfs
   apt: >
     state=installed
-    name=debian-zfs
+    name=zfsutils
 
 - name: setup /usr/local/sbin/zpool-scrub.sh file
   tags: