From 177350d84918f8cd64fa304ee9b5c55a1952a17d Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 22 Sep 2017 08:29:18 +0200 Subject: [PATCH] aagaard-> conova-node01 --- manifests/site.pp | 2 +- modules/debian_org/files/misc/local.yaml | 1 - modules/dsa_lvm/manifests/init.pp | 2 +- modules/grub/manifests/init.pp | 2 +- modules/grub/templates/puppet-kernel-serial.cfg.erb | 2 +- .../templates/obsolete-packages-ignore.d-hostspecific.erb | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index e10693304..2053e404c 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -53,7 +53,7 @@ node default { } } - if $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,ubc-bl4,byrd,clementi,czerny,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,csail-node01,csail-node02,grnet-node01,grnet-node02,ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10,aagaard,conova-node02] { + if $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,ubc-bl4,byrd,clementi,czerny,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,csail-node01,csail-node02,grnet-node01,grnet-node02,ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10,conova-node01,conova-node02] { include ganeti2 } diff --git a/modules/debian_org/files/misc/local.yaml b/modules/debian_org/files/misc/local.yaml index ea047c1f8..ca4a7dc17 100644 --- a/modules/debian_org/files/misc/local.yaml +++ b/modules/debian_org/files/misc/local.yaml @@ -1,6 +1,5 @@ --- nameinfo: - aagaard.debian.org: Thorvald Aagaard (June 8th, 1877 - March 22nd, 1937) abel.debian.org: Carl Friedrich Abel (1723 - 1787) 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) diff --git a/modules/dsa_lvm/manifests/init.pp b/modules/dsa_lvm/manifests/init.pp index 41ae6a486..084f81aaa 100644 --- a/modules/dsa_lvm/manifests/init.pp +++ b/modules/dsa_lvm/manifests/init.pp @@ -24,7 +24,7 @@ class dsa_lvm { 'ubc-enc2bl01','ubc-enc2bl02','ubc-enc2bl09','ubc-enc2bl10': { $conffile = 'lvm-ubc-ganeti2.conf' } - 'aagaard','conova-node02': { + 'conova-node01','conova-node02': { $conffile = 'lvm-conova-ganeti.conf' } default: { diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp index 2c0ee0049..9bff01184 100644 --- a/modules/grub/manifests/init.pp +++ b/modules/grub/manifests/init.pp @@ -9,7 +9,7 @@ class grub { $grub_manage = true $grub_do_kernel_serial = true $grub_do_grub_serial = true - } elsif $::hostname in [mirror-skroutz,aagaard,conova-node02,arm-arm-01,fasolo] { + } elsif $::hostname in [mirror-skroutz,conova-node01,conova-node02,arm-arm-01,fasolo] { $grub_manage = true $grub_do_kernel_serial = true $grub_do_grub_serial = true diff --git a/modules/grub/templates/puppet-kernel-serial.cfg.erb b/modules/grub/templates/puppet-kernel-serial.cfg.erb index b1dd87b04..ce68ad79f 100644 --- a/modules/grub/templates/puppet-kernel-serial.cfg.erb +++ b/modules/grub/templates/puppet-kernel-serial.cfg.erb @@ -2,7 +2,7 @@ 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" -<%- elsif %w{aagaard conova-node02}.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}.include?(@hostname) then -%> GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=tty0 console=ttyS1,115200n8" diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb index 963019b5b..2c9429e04 100644 --- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb +++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb @@ -16,7 +16,7 @@ end if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) <= 0 case @fqdn - when /(conova-node02|aagaard).debian.org/ then ignore << %w{qemu-efi} + when /(conova-node02|conova-node01).debian.org/ then ignore << %w{qemu-efi} end end -- 2.20.1