From 5a123dabe8f1ce60ef014065f1e398cdd38ccfc5 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 15 Jan 2016 21:04:34 +0100
Subject: [PATCH] blades update bm

---
 manifests/site.pp                   | 2 +-
 modules/multipath/manifests/init.pp | 5 +----
 modules/sudo/files/sudoers          | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 3681c3614..a2b2e8cb6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -49,7 +49,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,csail-node01,csail-node02,grnet-node01,grnet-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,csail-node01,csail-node02,grnet-node01,grnet-node02] {
 		include ganeti2
 	}
 
diff --git a/modules/multipath/manifests/init.pp b/modules/multipath/manifests/init.pp
index b983131f3..f2ece893e 100644
--- a/modules/multipath/manifests/init.pp
+++ b/modules/multipath/manifests/init.pp
@@ -8,10 +8,7 @@
 #
 class multipath {
 	case $::hostname {
-		bm-bl9: {
-			$conffile = 'multipath-bm-os.conf'
-		}
-		bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl13,bm-bl14: {
+		bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12: {
 			$conffile = 'multipath-bm.conf'
 		}
 		ubc-bl8,ubc-bl4,ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6: {
diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index 1da7e317a..c57d571a6 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -36,7 +36,7 @@ Host_Alias	BUILDD_PORTS_MASTER	= portman
 Host_Alias	PORTERBOXES	= abel, asachi, barriere, etler, falla, fischer, harris, merulo, minkus, partch, plummer, pizzetti, smetana, zelenka
 Host_Alias	PIUPARTS_SLAVE_HOSTS	= piu-slave-bm-a
 Host_Alias	MQ_HOSTS	= rainier, rapoport
-Host_Alias	NOVAHOSTS	= oyens, bm-bl9, bm-bl10, bm-bl11, bm-bl12
+Host_Alias	NOVAHOSTS	= oyens
 
 # Cmnd alias specification
 
-- 
2.20.1