From 70091d4278b3b614652c8ef99dc692e89bc28967 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Fri, 8 Nov 2019 22:12:07 +0100 Subject: [PATCH] decomission klecker rt#7582 --- data/nodes/klecker.debian.org.yaml | 2 -- modules/debian_org/files/misc/local.yaml | 2 +- modules/grub/manifests/init.pp | 2 +- modules/grub/templates/puppet-grub-serial.cfg.erb | 2 +- modules/grub/templates/puppet-kernel-serial.cfg.erb | 2 +- modules/linux/manifests/init.pp | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 data/nodes/klecker.debian.org.yaml diff --git a/data/nodes/klecker.debian.org.yaml b/data/nodes/klecker.debian.org.yaml deleted file mode 100644 index 9fdc0903e..000000000 --- a/data/nodes/klecker.debian.org.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -exim::mail_port: 2025 diff --git a/modules/debian_org/files/misc/local.yaml b/modules/debian_org/files/misc/local.yaml index 5879a42a9..4a153fb58 100644 --- a/modules/debian_org/files/misc/local.yaml +++ b/modules/debian_org/files/misc/local.yaml @@ -42,7 +42,7 @@ nameinfo: hoiby.debian.org: Lee Henry Hoiby (February 17th, 1926 - March 28th, 2011) jerea.debian.org: Hilda Jerea (March 17th, 1916 - May 14th, 1980) kaufmann.debian.org: Georg Friedrich Kauffmann (February 14th, 1679 - February 27th, 1735) - klecker.debian.org: Dedicated to Joel 'Espy' Klecker (1979 - July 11th, 2000) + new-klecker.debian.org: Dedicated to Joel 'Espy' Klecker (1979 - July 11th, 2000) lindsay.debian.org: Maria Lindsay Bliss (May 15th, 1827 - April 3rd, 1898) lotti.debian.org: Antonio Lotti (ca. 1667 - January 5th, 1740) mailly.debian.org: Alphonse Jean Ernest Mailly (November 27th, 1833 - January 10th, 1918) diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp index 88079f4dc..9e243ca18 100644 --- a/modules/grub/manifests/init.pp +++ b/modules/grub/manifests/init.pp @@ -7,7 +7,7 @@ class grub { $grub_do_kernel_serial = true $grub_do_grub_serial = true } - } elsif $::hostname in [ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10,casulana,mirror-anu,sallinen,storace,mirror-accumu,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14,grnet-node01,grnet-node02,csail-node01,csail-node02,byrd,mirror-isc,mirror-umn,lobos,villa,klecker,clementi,czerny,lw01,lw02,lw03,lw04,lw07,lw08,lw09,lw10] { + } elsif $::hostname in [ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10,casulana,mirror-anu,sallinen,storace,mirror-accumu,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14,grnet-node01,grnet-node02,csail-node01,csail-node02,byrd,mirror-isc,mirror-umn,lobos,villa,clementi,czerny,lw01,lw02,lw03,lw04,lw07,lw08,lw09,lw10] { $grub_manage = true $grub_do_kernel_serial = true $grub_do_grub_serial = true diff --git a/modules/grub/templates/puppet-grub-serial.cfg.erb b/modules/grub/templates/puppet-grub-serial.cfg.erb index 767a0ea34..36f476bf2 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 csail-node01 csail-node02}.include?(@hostname) then -%> +<%- if %w{storace 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 c8832e15a..b22cfdeb4 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 csail-node01 csail-node02}.include?(@hostname) then -%> +<%- elsif %w{storace fasolo 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" diff --git a/modules/linux/manifests/init.pp b/modules/linux/manifests/init.pp index 6b35ff111..64d6fa23c 100644 --- a/modules/linux/manifests/init.pp +++ b/modules/linux/manifests/init.pp @@ -3,7 +3,7 @@ class linux { include ferm::per_host include entropykey include rng_tools - if $::hostname in [fasolo, klecker, storace, sallinen] { + if $::hostname in [fasolo, storace, sallinen] { $blacklist_acpi_power_meter = true } if $blacklist_acpi_power_meter { -- 2.20.1