From 10d25ee03171da57901dc7843c747d8476a9202b Mon Sep 17 00:00:00 2001
From: Tobias Hachmer <tobias@hachmer.de>
Date: Sun, 12 Nov 2017 14:35:11 +0100
Subject: [PATCH] Move dummy module from role kmod-batman to server-basic

---
 roles/kmod-batman/tasks/main.yml                      |  7 ++-----
 roles/kmod-batman/templates/batman-adv.module.conf.j2 |  1 -
 roles/server-basic/README.md                          |  1 +
 roles/server-basic/tasks/main.yml                     | 11 +++++++++++
 roles/server-basic/templates/dummy.module.conf.j2     |  5 +++++
 5 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 roles/server-basic/templates/dummy.module.conf.j2

diff --git a/roles/kmod-batman/tasks/main.yml b/roles/kmod-batman/tasks/main.yml
index 0991b4e..8cc799e 100644
--- a/roles/kmod-batman/tasks/main.yml
+++ b/roles/kmod-batman/tasks/main.yml
@@ -13,10 +13,7 @@
     src: batman-adv.module.conf.j2
     dest: /etc/modules-load.d/batman-adv.conf
 
-- name: load batman + dummy module
+- name: load batman module
   modprobe:
-    name: "{{ item }}"
+    name: "batman-adv"
     state: present
-  with_items:
-    - batman-adv
-    - dummy
diff --git a/roles/kmod-batman/templates/batman-adv.module.conf.j2 b/roles/kmod-batman/templates/batman-adv.module.conf.j2
index 35d76b4..b0b819f 100644
--- a/roles/kmod-batman/templates/batman-adv.module.conf.j2
+++ b/roles/kmod-batman/templates/batman-adv.module.conf.j2
@@ -3,4 +3,3 @@
 # {{ ansible_managed }}
 #
 batman-adv
-dummy
diff --git a/roles/server-basic/README.md b/roles/server-basic/README.md
index d454a25..2761041 100644
--- a/roles/server-basic/README.md
+++ b/roles/server-basic/README.md
@@ -6,6 +6,7 @@ Diese Ansible role installiert Pakete, die auf allen MWU-Server benötigt werden
 - setzt vim als default Editor
 - setzt die Zeitzone auf Europe/Berlin
 - generiert und setzt default locale
+- konfiguriert das dummy Kernel Modul
 
 ## Benötigte Variablen
 
diff --git a/roles/server-basic/tasks/main.yml b/roles/server-basic/tasks/main.yml
index e14a925..f3fcd68 100644
--- a/roles/server-basic/tasks/main.yml
+++ b/roles/server-basic/tasks/main.yml
@@ -30,3 +30,14 @@
     owner: admin
     group: admin
     mode: 0750
+
+- name: configure dummy module to load on system boot
+  template:
+    src: dummy.module.conf.j2
+    dest: /etc/modules-load.d/dummy.conf
+
+- name: load dummy module
+  modprobe:
+    name: "dummy"
+    state: present
+    params: "numdummies=0"
diff --git a/roles/server-basic/templates/dummy.module.conf.j2 b/roles/server-basic/templates/dummy.module.conf.j2
new file mode 100644
index 0000000..4beefe7
--- /dev/null
+++ b/roles/server-basic/templates/dummy.module.conf.j2
@@ -0,0 +1,5 @@
+#
+# Load dummy module on system boot
+# {{ ansible_managed }}
+#
+dummy