From: Peter Palfrader Date: Sat, 16 May 2015 20:23:44 +0000 (+0200) Subject: tristano -> ubc-bl3 X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e8862bd29c97afcdf772f9c689948e958ae71295;p=mirror%2Fdsa-puppet.git tristano -> ubc-bl3 --- diff --git a/hieradata/clusters/ganeti2.debian.org.yaml b/hieradata/clusters/ganeti2.debian.org.yaml index a090db8fb..64bb0f7fd 100644 --- a/hieradata/clusters/ganeti2.debian.org.yaml +++ b/hieradata/clusters/ganeti2.debian.org.yaml @@ -1,6 +1,6 @@ --- nodes: - - 'tristano.debian.org' + - 'ubc-bl3.debian.org' - 'pasquini.debian.org' - 'ubc-bl2.debian.org' - 'boito.debian.org' diff --git a/manifests/site.pp b/manifests/site.pp index c1089a87d..f87b9be85 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -48,7 +48,7 @@ node default { } } - if $::hostname in [pasquini,tristano,ubc-bl2,boito,ubc-bl8,luchesi,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,csail-node01,csail-node02,grnet-node01,grnet-node02] { + if $::hostname in [pasquini,ubc-bl3,ubc-bl2,boito,ubc-bl8,luchesi,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,csail-node01,csail-node02,grnet-node01,grnet-node02] { include ganeti2 } diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index 1c9412726..2b8a9d34c 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -127,7 +127,6 @@ nameinfo: tchaikovsky.debian.org: Pyotr Ilyich Tchaikovsky (Пётр Ильич Чайковский) (May 7th, 1840 - November 6th, 1893) ticharich.debian.org: Zdenka Ticharich (September 26th, 1900 - February 15th, 1979) traetta.debian.org: Tommaso Michele Francesco Saverio Traetta (March 30th, 1727 - April 6th, 1779) - tristano.debian.org: Gerardo Tristano (July 1st, 1955 - ongoing) tye.debian.org: Christopher Tye (c.1505 - 1573) ullmann.debian.org: Viktor Ullmann (January 1st, 1898 - October 17th, 1944) vento.debian.org: Ivo de Vento (1543/1545 - 1575) diff --git a/modules/lvm/manifests/init.pp b/modules/lvm/manifests/init.pp index cfa9e0f08..7ce0c8c10 100644 --- a/modules/lvm/manifests/init.pp +++ b/modules/lvm/manifests/init.pp @@ -3,7 +3,7 @@ class lvm { ubc-bl8,luchesi: { $conffile = 'lvm-ubc-ganeti.conf' } - tristano,pasquini,ubc-bl2,boito: { + ubc-bl3,pasquini,ubc-bl2,boito: { $conffile = 'lvm-ubc-ganeti-p410.conf' } csail-node01,csail-node02: { diff --git a/modules/multipath/manifests/init.pp b/modules/multipath/manifests/init.pp index b953e432f..90b8fbb35 100644 --- a/modules/multipath/manifests/init.pp +++ b/modules/multipath/manifests/init.pp @@ -14,7 +14,7 @@ class multipath { bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl13,bm-bl14: { $conffile = 'multipath-bm.conf' } - ubc-bl8,luchesi,pasquini,tristano,ubc-bl2,boito: { + ubc-bl8,luchesi,pasquini,ubc-bl3,ubc-bl2,boito: { $conffile = 'multipath-ubc-ganeti.conf' } default: { diff --git a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb index f89e732de..4327b9a0d 100644 --- a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb +++ b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb @@ -25,7 +25,7 @@ blacklist { devnode "^hd[a-z][[0-9]*]" devnode "^vd[a-z]" devnode "^cciss!c[0-9]d[0-9]*[p[0-9]*]" -<%- if %w{pasquini tristano boito ubc-bl2}.include?(hostname) then -%> +<%- if %w{pasquini ubc-bl3 boito ubc-bl2}.include?(hostname) then -%> devnode "^sda[0-9]*$" <%- end -%> device { diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb index ce5f1ee8b..912d39f2d 100644 --- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb +++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb @@ -20,7 +20,6 @@ when /(parry|partch).debian.org/ then ignore << "yaboot when "handel.debian.org" then ignore << %w{puppet-dashboard} when "reger.debian.org" then ignore << %w{librt-extension-commandbymail-perl} when /(rainier|rapoport).debian.org/ then ignore << %w{rabbitmq-server} -when /(pasquini|tristano).debian.org/ then ignore << %w{ganeti-instance-image} when "zemlinsky.debian.org" then ignore << %w{initramfs-tools} when "sibelius.debian.org" then ignore << %w{tivsm-ba tivsm-api64 gskssl64 gskcrypt64 tivsm-api gskssl gskcrypt} when "vogler.debian.org" then ignore << %w{repro libresiprocate-1.9 resiprocate-turn-server}