From 12ee5e4f8ecdb0032f28a70d858b431bcb8ac76d Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Tue, 11 Jun 2019 14:37:32 +0200 Subject: [PATCH] Add arm-ubc-05 and arm-ubc-06 --- modules/debian_org/files/misc/local.yaml | 2 ++ modules/grub/templates/puppet-kernel-serial.cfg.erb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/debian_org/files/misc/local.yaml b/modules/debian_org/files/misc/local.yaml index d6d22f5bb..22cf03d66 100644 --- a/modules/debian_org/files/misc/local.yaml +++ b/modules/debian_org/files/misc/local.yaml @@ -154,6 +154,8 @@ host_settings: - arm-ubc-02.debian.org - arm-ubc-03.debian.org - arm-ubc-04.debian.org + - arm-ubc-05.debian.org + - arm-ubc-06.debian.org - arnold.debian.org - eberlin.debian.org - hartmann.debian.org diff --git a/modules/grub/templates/puppet-kernel-serial.cfg.erb b/modules/grub/templates/puppet-kernel-serial.cfg.erb index ad9a23ec5..f74449b26 100644 --- a/modules/grub/templates/puppet-kernel-serial.cfg.erb +++ b/modules/grub/templates/puppet-kernel-serial.cfg.erb @@ -1,4 +1,4 @@ -<%- if %w{amdahl arm-conova-01 arm-conova-02 arm-arm-01 arm-ubc-01 arm-ubc-02 arm-ubc-03 arm-ubc-04}.include?(@hostname) then -%> +<%- if %w{amdahl arm-conova-01 arm-conova-02 arm-arm-01 arm-ubc-01 arm-ubc-02 arm-ubc-03 arm-ubc-04 arm-ubc-05 arm-ubc-06}.include?(@hostname) then -%> GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyAMA0,115200n8" <%- elsif %w{arm-arm-03}.include?(@hostname) then -%> GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200" -- 2.20.1