Merge pull request #53 from realraum/install/serial

make kernel command line options configurable

diff --git a/ansible/host_vars/gnocchi0/main.yml b/ansible/host_vars/gnocchi0/main.yml
index d1fc949..7d46862 100644 (file)
--- a/ansible/host_vars/gnocchi0/main.yml
+++ b/ansible/host_vars/gnocchi0/main.yml
@@ -11,3 +11,5 @@ network:
 install:
   disks:
     primary: /dev/disk/by-id/ata-KINGSTON_SMS200S360G_50026B726A0002A2
+  kernel_cmdline:
+    - console=ttyS0,115200n8

diff --git a/ansible/host_vars/gnocchi1/main.yml b/ansible/host_vars/gnocchi1/main.yml
index 008bc57..6ecab28 100644 (file)
--- a/ansible/host_vars/gnocchi1/main.yml
+++ b/ansible/host_vars/gnocchi1/main.yml
@@ -11,3 +11,5 @@ network:
 install:
   disks:
     primary: /dev/disk/by-id/ata-KINGSTON_SMS200S360G_50026B726A00DFF4
+  kernel_cmdline:
+    - console=ttyS0,115200n8

diff --git a/ansible/roles/base/handlers/main.yml b/ansible/roles/base/handlers/main.yml
index a86fcde..920db82 100644 (file)
--- a/ansible/roles/base/handlers/main.yml
+++ b/ansible/roles/base/handlers/main.yml
@@ -8,3 +8,6 @@
   service:
     name: openntpd
     state: restarted
+
+- name: update grub
+  command: update-grub

diff --git a/ansible/roles/base/tasks/07grub.yml b/ansible/roles/base/tasks/07grub.yml
new file mode 100644 (file)
index 0000000..4aa2122
--- /dev/null
+++ b/ansible/roles/base/tasks/07grub.yml
@@ -0,0 +1,8 @@
+---
+- name: set kernel command line options
+  lineinfile:
+    path: /etc/default/grub
+    regexp: '^#?GRUB_CMDLINE_LINUX='
+    line: 'GRUB_CMDLINE_LINUX="{{ install.kernel_cmdline | join(" ") }}"'
+  when: install is defined and install.kernel_cmdline is defined
+  notify: update grub

diff --git a/ansible/roles/base/tasks/main.yml b/ansible/roles/base/tasks/main.yml
index cff0d6a..124fa74 100644 (file)
--- a/ansible/roles/base/tasks/main.yml
+++ b/ansible/roles/base/tasks/main.yml
@@ -6,3 +6,4 @@
   import_tasks: 04systemd.yml
 - import_tasks: 05tools.yml
 - import_tasks: 06net.yml
+- import_tasks: 07grub.yml

diff --git a/ansible/usb-install.yml b/ansible/usb-install.yml
index 7469fe2..9662520 100644 (file)
--- a/ansible/usb-install.yml
+++ b/ansible/usb-install.yml
@@ -49,7 +49,7 @@
               LABEL linux
                KERNEL linux
                INITRD initrd.preseed.gz
-               APPEND install vga=off console=ttyS0,115200n8
+               APPEND install {{ (install.kernel_cmdline | default([])) | join(' ') }}
 
         - name: Make the USB disk bootable
           pause: