From: Aurelien Jarno Date: Tue, 5 Sep 2017 21:13:49 +0000 (+0200) Subject: Add amdahl.debian.org (arm64 porterbox) X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ba515449d9714ad0fc8be312c1b420a31715dcd3;p=mirror%2Fdsa-puppet.git Add amdahl.debian.org (arm64 porterbox) Signed-off-by: Aurelien Jarno --- diff --git a/modules/debian_org/files/misc/local.yaml b/modules/debian_org/files/misc/local.yaml index 5bf143a92..0accb90b9 100644 --- a/modules/debian_org/files/misc/local.yaml +++ b/modules/debian_org/files/misc/local.yaml @@ -4,6 +4,7 @@ nameinfo: abel.debian.org: Carl Friedrich Abel (1723 - 1787) acker.debian.org: Dieter Acker (November 3rd, 1940 - May 27th, 2006) adayevskaya.debian.org: Ella Georgiyevna Adayevskaya (February, 22nd 1846 [O.S. February 10th] - July 26th, 1926) + amdahl.debian.org: Bjarne Fredrik Berg Amdahl (August 17th, 1903 - April 14th, 1968) antheil.debian.org: George Antheil (1900 - 1959) arnold.debian.org: Malcolm Henry Arnold (1921 - 2006) asachi.debian.org: Elena Asachi (1789 - 1877) @@ -141,6 +142,7 @@ host_settings: not-bacula-client: # porterbox - abel.debian.org + - amdahl.debian.org - asachi.debian.org - barriere.debian.org - binet.debian.org diff --git a/modules/grub/templates/puppet-kernel-serial.cfg.erb b/modules/grub/templates/puppet-kernel-serial.cfg.erb index 1f1c39513..887037964 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{arm-conova-01 arm-arm-01}.include?(@hostname) then -%> +<%- if %w{amdahl arm-conova-01 arm-arm-01}.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" diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers index 8aa9422c0..f5c09c62d 100644 --- a/modules/sudo/files/sudoers +++ b/modules/sudo/files/sudoers @@ -31,7 +31,7 @@ Host_Alias AACRAIDHOSTS = pettersson Host_Alias MEGARAIDHOSTS = sibelius Host_Alias LISTHOSTS = bendel Host_Alias BUILDD_MASTER = wuiet -Host_Alias PORTERBOXES = abel, asachi, barriere, eller, falla, fischer, harris, minkus, partch, plummer, pizzetti, zelenka +Host_Alias PORTERBOXES = abel, amdahl, asachi, barriere, eller, falla, fischer, harris, minkus, partch, plummer, pizzetti, zelenka Host_Alias PIUPARTS_SLAVE_HOSTS = piu-slave-bm-a, piu-slave-ubc-01 Host_Alias MQ_HOSTS = rainier, rapoport Host_Alias JENKINSHOSTS = jerea