From: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon, 10 Jun 2019 19:23:24 +0000 (+0200)
Subject: Add arm-ubc-04.debian.org
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=cab180610e24bb0b6b632aa947eb1d93c95e5379

Add arm-ubc-04.debian.org
---

diff --git a/modules/debian_org/files/misc/local.yaml b/modules/debian_org/files/misc/local.yaml
index ad62ffa60..d6d22f5bb 100644
--- a/modules/debian_org/files/misc/local.yaml
+++ b/modules/debian_org/files/misc/local.yaml
@@ -153,6 +153,7 @@ host_settings:
     - arm-ubc-01.debian.org
     - arm-ubc-02.debian.org
     - arm-ubc-03.debian.org
+    - arm-ubc-04.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 5fc1fee47..ad9a23ec5 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}.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}.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"