From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 17 May 2015 06:59:48 +0000 (+0200)
Subject: boito -> ubc-bl6
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b319b9f348a4deaf87aae506d23133e3c2086e79;p=mirror%2Fdsa-puppet.git

boito -> ubc-bl6
---

diff --git a/hieradata/clusters/ganeti2.debian.org.yaml b/hieradata/clusters/ganeti2.debian.org.yaml
index 84c655f18..1898af430 100644
--- a/hieradata/clusters/ganeti2.debian.org.yaml
+++ b/hieradata/clusters/ganeti2.debian.org.yaml
@@ -3,6 +3,6 @@ nodes:
   - 'ubc-bl3.debian.org'
   - 'ubc-bl7.debian.org'
   - 'ubc-bl2.debian.org'
-  - 'boito.debian.org'
+  - 'ubc-bl6.debian.org'
   - 'ubc-bm8.debian.org'
   - 'luchesi.debian.org'
diff --git a/manifests/site.pp b/manifests/site.pp
index cefc3f1b9..8af2f9192 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -48,7 +48,7 @@ node default {
 		}
 	}
 
-	if $::hostname in [ubc-bl7,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] {
+	if $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,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 d5e54b9d5..00261adb4 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -14,7 +14,6 @@ nameinfo:
   berlioz.debian.org: Hector Berlioz (December 11th, 1803 - March 8th, 1869)
   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)
   brahms.debian.org: Johannes Brahms (May 7th, 1833 - April 3rd, 1897)
   busoni.debian.org: Ferruccio Dante Michelangiolo Benvenuto Busoni (April 1st, 1866 - July 27th, 1924)
   buxtehude.debian.org: Dieterich Buxtehude (c. 1637 to 1639 - May 9th, 1707)
diff --git a/modules/lvm/manifests/init.pp b/modules/lvm/manifests/init.pp
index b373061d1..bae9aef54 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'
 		}
-		ubc-bl3,ubc-bl7,ubc-bl2,boito: {
+		ubc-bl3,ubc-bl7,ubc-bl2,ubc-bl6: {
 			$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 bc3be2d68..f9dc2c4fb 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,ubc-bl7,ubc-bl3,ubc-bl2,boito: {
+		ubc-bl8,luchesi,ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6: {
 			$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 24218cade..eba65ab6e 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{ubc-bl7 ubc-bl3 boito ubc-bl2}.include?(hostname) then -%>
+<%- if %w{ubc-bl7 ubc-bl3 ubc-bl6 ubc-bl2}.include?(hostname) then -%>
         devnode "^sda[0-9]*$"
 <%- end -%>
         device {