From 1a7b03382533410c8b10d44ad8d522086f199cdb Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 28 Apr 2020 10:21:38 +0200 Subject: no more meta --- roles/wireguard/base/meta/main.yml | 4 ---- roles/wireguard/base/tasks/main.yml | 4 ++++ roles/zfs/base/meta/main.yml | 3 --- roles/zfs/base/tasks/Debian.yml | 4 ++++ 4 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 roles/wireguard/base/meta/main.yml delete mode 100644 roles/zfs/base/meta/main.yml (limited to 'roles') diff --git a/roles/wireguard/base/meta/main.yml b/roles/wireguard/base/meta/main.yml deleted file mode 100644 index 3542c2fa..00000000 --- a/roles/wireguard/base/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -dependencies: -- role: prepare-dkms -- role: apt-repo/spreadspace diff --git a/roles/wireguard/base/tasks/main.yml b/roles/wireguard/base/tasks/main.yml index 11761c33..6b7cea23 100644 --- a/roles/wireguard/base/tasks/main.yml +++ b/roles/wireguard/base/tasks/main.yml @@ -1,4 +1,8 @@ --- +- name: install dkms + import_role: + name: prepare-dkms + - name: install wireguard packages apt: name: diff --git a/roles/zfs/base/meta/main.yml b/roles/zfs/base/meta/main.yml deleted file mode 100644 index 300d0ccf..00000000 --- a/roles/zfs/base/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: -- role: prepare-dkms diff --git a/roles/zfs/base/tasks/Debian.yml b/roles/zfs/base/tasks/Debian.yml index 450d9300..b9fdda95 100644 --- a/roles/zfs/base/tasks/Debian.yml +++ b/roles/zfs/base/tasks/Debian.yml @@ -1,4 +1,8 @@ --- +- name: install dkms + import_role: + name: prepare-dkms + ## TODO: make sure contrib repo is enabled - name: install zfs-dkms -- cgit v1.2.3