summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2018-05-05 02:29:13 +0200
committerChristian Pointner <equinox@spreadspace.org>2018-05-05 02:29:13 +0200
commitc5e5d49e2c3c443043d813623420b65367454d90 (patch)
tree9cdf81dfdc493a54c4d9f623a07be95d7982fe06
parentminor renaming (diff)
fix dkms role for scaleway boxes with 'custom' kernel
-rw-r--r--host_playbooks/emc-test.yml3
-rw-r--r--hosts.ini8
-rw-r--r--roles/prepare-dkms/tasks/default.yml2
-rw-r--r--roles/prepare-dkms/tasks/main.yml4
4 files changed, 13 insertions, 4 deletions
diff --git a/host_playbooks/emc-test.yml b/host_playbooks/emc-test.yml
index 2a298e8b..e3c6c997 100644
--- a/host_playbooks/emc-test.yml
+++ b/host_playbooks/emc-test.yml
@@ -2,8 +2,9 @@
- name: Basic Setup
hosts: emc-test
roles:
- - role: hetzner-slim
+ - role: scaleway-slim
- role: base
- role: sshserver
- role: zsh
- role: admin-user
+ - role: wireguard
diff --git a/hosts.ini b/hosts.ini
index 286b24aa..28fb4e4e 100644
--- a/hosts.ini
+++ b/hosts.ini
@@ -61,7 +61,15 @@ elesearch
[hetzner:children]
emc-xx
+
+[scaleway-kernel]
+# emc-test
+
[scaleway]
+emc-test
+
+[scaleway:children]
+scaleway-kernel
### kubernetes cluster: emc
diff --git a/roles/prepare-dkms/tasks/default.yml b/roles/prepare-dkms/tasks/default.yml
index f3df9c36..f3748feb 100644
--- a/roles/prepare-dkms/tasks/default.yml
+++ b/roles/prepare-dkms/tasks/default.yml
@@ -1,7 +1,7 @@
---
- name: install kernel headers and dkms
with_items:
- - linux-headers-amd64
+# - linux-headers-amd64 # TODO: fix this so it works for ubuntu(hwe) and debian
- dkms
apt:
name: "{{ item }}"
diff --git a/roles/prepare-dkms/tasks/main.yml b/roles/prepare-dkms/tasks/main.yml
index b3b63168..f415ec2b 100644
--- a/roles/prepare-dkms/tasks/main.yml
+++ b/roles/prepare-dkms/tasks/main.yml
@@ -1,8 +1,8 @@
---
- name: prepare dkms on scaleway boxes
include_tasks: scaleway.yml
- when: "'scaleway' in group_names"
+ when: "'scaleway-kernel' in group_names"
- name: prepare dkms for non-scaleway boxes
include_tasks: default.yml
- when: "'scaleway' not in group_names"
+ when: "'scaleway-kernel' not in group_names"