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 --- common/kubernetes.yml | 2 ++ dan/ele-gwhetzner.yml | 1 + 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 ++++ 6 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 roles/wireguard/base/meta/main.yml delete mode 100644 roles/zfs/base/meta/main.yml diff --git a/common/kubernetes.yml b/common/kubernetes.yml index d5b58767..27da0bf1 100644 --- a/common/kubernetes.yml +++ b/common/kubernetes.yml @@ -38,6 +38,8 @@ - name: kubernetes base installation hosts: _kubernetes_nodes_ roles: + - role: apt-repo/spreadspace + when: kubernetes_network_plugin == 'kubeguard' - role: kubernetes/net/kubeguard when: kubernetes_network_plugin == 'kubeguard' - role: kubernetes/base diff --git a/dan/ele-gwhetzner.yml b/dan/ele-gwhetzner.yml index 5975014f..fb6defaa 100644 --- a/dan/ele-gwhetzner.yml +++ b/dan/ele-gwhetzner.yml @@ -5,5 +5,6 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/spreadspace - role: wireguard/base - role: wireguard/gateway 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