From: Julien Cristau Date: Tue, 1 Oct 2019 18:16:28 +0000 (+0200) Subject: Use ttyS1 on csail-node0[12] X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a3602762e8a1122180fd557284f7e78875ea89ec;p=mirror%2Fdsa-puppet.git Use ttyS1 on csail-node0[12] --- diff --git a/modules/grub/templates/puppet-grub-serial.cfg.erb b/modules/grub/templates/puppet-grub-serial.cfg.erb index 6d43cbd6d..767a0ea34 100644 --- a/modules/grub/templates/puppet-grub-serial.cfg.erb +++ b/modules/grub/templates/puppet-grub-serial.cfg.erb @@ -1,5 +1,5 @@ GRUB_TERMINAL="serial console" -<%- if %w{storace klecker clementi czerny}.include?(@hostname) then -%> +<%- if %w{storace klecker clementi czerny csail-node01 csail-node02}.include?(@hostname) then -%> GRUB_SERIAL_COMMAND="serial --unit=1 --speed=115200 --word=8 --parity=no --stop=1" <% else -%> GRUB_SERIAL_COMMAND="serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1" diff --git a/modules/grub/templates/puppet-kernel-serial.cfg.erb b/modules/grub/templates/puppet-kernel-serial.cfg.erb index f74449b26..c8832e15a 100644 --- a/modules/grub/templates/puppet-kernel-serial.cfg.erb +++ b/modules/grub/templates/puppet-kernel-serial.cfg.erb @@ -4,7 +4,7 @@ GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyAMA0,115200n8" GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200" <%- elsif %w{conova-node01 conova-node02}.include?(@hostname) then -%> GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200 earlycon" -<%- elsif %w{storace fasolo klecker clementi czerny casulana mirror-umn}.include?(@hostname) then -%> +<%- elsif %w{storace fasolo klecker clementi czerny casulana mirror-umn csail-node01 csail-node02}.include?(@hostname) then -%> GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=tty0 console=ttyS1,115200n8" <% else -%> GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=tty0 console=ttyS0,115200n8"