From 062beea02a6a040d7927ad80a2d6489c37cf1672 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 16 May 2015 14:20:10 +0200 Subject: [PATCH] replace a few bertali occurrences with ubc-bl2 --- hieradata/clusters/ganeti2.debian.org.yaml | 2 +- manifests/site.pp | 2 +- modules/debian-org/misc/local.yaml | 1 - modules/lvm/manifests/init.pp | 2 +- modules/multipath/manifests/init.pp | 2 +- modules/multipath/templates/multipath-ubc-ganeti.conf.erb | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/hieradata/clusters/ganeti2.debian.org.yaml b/hieradata/clusters/ganeti2.debian.org.yaml index 08e8da098..a090db8fb 100644 --- a/hieradata/clusters/ganeti2.debian.org.yaml +++ b/hieradata/clusters/ganeti2.debian.org.yaml @@ -2,7 +2,7 @@ nodes: - 'tristano.debian.org' - 'pasquini.debian.org' - - 'bertali.debian.org' + - 'ubc-bl2.debian.org' - 'boito.debian.org' - 'ubc-bm8.debian.org' - 'luchesi.debian.org' diff --git a/manifests/site.pp b/manifests/site.pp index 0695176a9..c1089a87d 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -48,7 +48,7 @@ node default { } } - if $::hostname in [pasquini,tristano,bertali,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,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] { include ganeti2 } diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index e59141337..1c9412726 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -12,7 +12,6 @@ nameinfo: beethoven.debian.org: Ludwig van Beethoven (December 16th, 1770 - March 26th, 1827) bendel.debian.org: Franz Bendel (March 23rd, 1833 - July 3rd, 1874) berlioz.debian.org: Hector Berlioz (December 11th, 1803 - March 8th, 1869) - bertali.debian.org: Antonio Bertali (March 1605 - 17 April 1669) binet.debian.org: Jocelyne Binet (September 27th, 1923 - January 13th, 1968) bizet.debian.org: Georges Bizet, (October 25th, 1838 - June 3rd, 1875) boiti.debian.org: Arrigo Boito (February 24th, 1842 - June 10th, 1918) diff --git a/modules/lvm/manifests/init.pp b/modules/lvm/manifests/init.pp index 94d0b2859..cfa9e0f08 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,bertali,boito: { + tristano,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 40002caf7..b953e432f 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,bertali,boito: { + ubc-bl8,luchesi,pasquini,tristano,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 8edfe7de6..f89e732de 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 bertali}.include?(hostname) then -%> +<%- if %w{pasquini tristano boito ubc-bl2}.include?(hostname) then -%> devnode "^sda[0-9]*$" <%- end -%> device { -- 2.20.1