X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fgrub%2Ftemplates%2Fpuppet-kernel-serial.cfg.erb;h=d87090fe9eef3d18bb3b921f98ce4d17f493d841;hb=95ad9e1fdeab869e54f27b52c8857c505aca7cde;hp=f35ad04b78495434c46f259395613324d748ba5d;hpb=c11a78bacd6ddabf14ac16338c36a4dc5634a811;p=mirror%2Fdsa-puppet.git

diff --git a/modules/grub/templates/puppet-kernel-serial.cfg.erb b/modules/grub/templates/puppet-kernel-serial.cfg.erb
index f35ad04b7..d87090fe9 100644
--- a/modules/grub/templates/puppet-kernel-serial.cfg.erb
+++ b/modules/grub/templates/puppet-kernel-serial.cfg.erb
@@ -1,9 +1,11 @@
-<%- if %w{arm-conova-01 arm-arm-01}.include?(hostname) then -%>
+<%- if %w{amdahl arm-conova-01 arm-conova-02 arm-arm-01}.include?(@hostname) then -%>
 GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyAMA0,115200n8"
-<%- elsif %w{arm-arm-03}.include?(hostname) then -%>
+<%- elsif %w{arm-arm-03}.include?(@hostname) then -%>
 GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200"
-<%- elsif %w{aagaard acker}.include?(hostname) then -%>
+<%- 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}.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"
 <%- end -%>