From d15ca1929aa621f9b3bb1dd12bf3d4dd6269647e Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Sun, 19 May 2019 13:57:14 +0000
Subject: [PATCH] handle grub cmdline more flexibly (one place for everything)

---
 inventories/servers.yml        | 10 ++++++++--
 playbook.yml                   |  1 +
 roles/docker/handlers/main.yml |  3 ---
 roles/docker/tasks/kernel.yml  |  7 -------
 roles/docker/tasks/main.yml    |  3 ---
 roles/grub/handlers/main.yml   |  3 +++
 roles/grub/tasks/cmdline.yml   |  7 +++++++
 roles/grub/tasks/main.yml      |  7 +++++++
 8 files changed, 26 insertions(+), 15 deletions(-)
 delete mode 100644 roles/docker/tasks/kernel.yml
 create mode 100644 roles/grub/handlers/main.yml
 create mode 100644 roles/grub/tasks/cmdline.yml
 create mode 100644 roles/grub/tasks/main.yml

diff --git a/inventories/servers.yml b/inventories/servers.yml
index 54fc6a2..13ce298 100644
--- a/inventories/servers.yml
+++ b/inventories/servers.yml
@@ -3,5 +3,11 @@ servers:
     issei:
       ansible_host: issei.home.sbruder.de
       ansible_user: root
-  vars:
-    debian_release: buster
+
+      debian_release: buster
+      initramfs:
+        network:
+          address: 192.168.100.90
+          gateway: 192.168.100.1
+          netmask: 255.255.255.0
+          interface: enp0s25
diff --git a/playbook.yml b/playbook.yml
index 97e7bd5..70e048d 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -5,6 +5,7 @@
     - role: base
     - role: dnsmasq
     - role: docker
+    - role: grub
     - role: initramfs
     - role: postfix
     - role: python
diff --git a/roles/docker/handlers/main.yml b/roles/docker/handlers/main.yml
index c862e7d..872f5cb 100644
--- a/roles/docker/handlers/main.yml
+++ b/roles/docker/handlers/main.yml
@@ -1,7 +1,4 @@
 ---
-- name: update-grub
-  shell: update-grub
-
 - name: restart-docker
   systemd:
     name: docker
diff --git a/roles/docker/tasks/kernel.yml b/roles/docker/tasks/kernel.yml
deleted file mode 100644
index 42df66b..0000000
--- a/roles/docker/tasks/kernel.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- name: add boot parameters for docker
-  lineinfile:
-    path: /etc/default/grub
-    regexp: ^GRUB_CMDLINE_LINUX_DEFAULT=
-    line: 'GRUB_CMDLINE_LINUX_DEFAULT="quiet cgroup_enable=memory swapaccount=1"'
-  notify: update-grub
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index c165a32..481c4ed 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -3,9 +3,6 @@
   - import_tasks: packages.yml
     tags:
       - docker:packages
-  - import_tasks: kernel.yml
-    tags:
-      - docker:kernel
   - import_tasks: config.yml
     tags:
       - docker:config
diff --git a/roles/grub/handlers/main.yml b/roles/grub/handlers/main.yml
new file mode 100644
index 0000000..72b1e42
--- /dev/null
+++ b/roles/grub/handlers/main.yml
@@ -0,0 +1,3 @@
+---
+- name: update-grub
+  shell: update-grub
diff --git a/roles/grub/tasks/cmdline.yml b/roles/grub/tasks/cmdline.yml
new file mode 100644
index 0000000..ea5dfca
--- /dev/null
+++ b/roles/grub/tasks/cmdline.yml
@@ -0,0 +1,7 @@
+---
+- name: add boot parameters for docker
+  lineinfile:
+    path: /etc/default/grub
+    regexp: ^GRUB_CMDLINE_LINUX_DEFAULT=
+    line: 'GRUB_CMDLINE_LINUX_DEFAULT="quiet cgroup_enable=memory swapaccount=1{% if initramfs.network %} ip={{ initramfs.network.address }}::{{ initramfs.network.gateway }}:{{ initramfs.network.netmask }}:{{ inventory_hostname }}:{{ initramfs.network.interface }}:off{% endif %}"'
+  notify: update-grub
diff --git a/roles/grub/tasks/main.yml b/roles/grub/tasks/main.yml
new file mode 100644
index 0000000..d140171
--- /dev/null
+++ b/roles/grub/tasks/main.yml
@@ -0,0 +1,7 @@
+---
+- block:
+  - import_tasks: cmdline.yml
+    tags:
+      - grub:cmdline
+  tags:
+    - grub