X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-bm.conf.erb;h=7d6a547cbed1d7fe8e5fd602db9cbb3dbafbd9a6;hb=25ddb91cba0c307273c51674d767828e6007553b;hp=66d34645a09288dc613b489881aff090a3f9409d;hpb=ebb13e37cad60c5e62c351b004f311d2d32d5bda;p=mirror%2Fdsa-puppet.git

diff --git a/modules/multipath/templates/multipath-bm.conf.erb b/modules/multipath/templates/multipath-bm.conf.erb
index 66d34645a..7d6a547cb 100644
--- a/modules/multipath/templates/multipath-bm.conf.erb
+++ b/modules/multipath/templates/multipath-bm.conf.erb
@@ -13,33 +13,17 @@ blacklist_exceptions {
 
 multipaths {
 	multipath {
-		wwid	3600c0ff000d5ad34b41a635401000000
-		alias	adayevskaya
+		wwid	3600c0ff000d5ad34d7d8fa5501000000
+		alias	OLD-backuphost
 	}
 	multipath {
-		wwid	3600c0ff000d5ad34d7d8fa5501000000
-		alias	backuphost
+		wwid	3600c0ff000d5ad3406de855d01000000
+		alias	backuphost2
 	}
 	multipath {
 		wwid	3600c0ff000d838e2e7d8fa5501000000
 		alias	backuphost-lvm
 	}
-	multipath {
-		wwid	3600c0ff000d5ad346d96635401000000
-		alias	barriere
-	}
-	multipath {
-		wwid	3600c0ff000d5ad34e88c635401000000
-		alias	barriere-lvm
-	}
-	multipath {
-		wwid	3600c0ff000d5ad34f559665401000000
-		alias	binet
-	}
-	multipath {
-		wwid	3600c0ff000d5ad34fb59665401000000
-		alias	binet-lvm
-	}
 	multipath {
 		wwid	3600c0ff000d5ad344455675401000000
 		alias	bmdb1
@@ -54,166 +38,106 @@ multipaths {
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34f874635401000000
-		alias	coccia
+		alias	OLD-coccia
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34ac83635401000000
-		alias	coccia-lvm
+		alias	OLD-coccia-lvm
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34389b6b5401000000
-		alias	delfin
+		alias	OLD-delfin
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34aafd825601000000
-		alias	delfin-lvm
+		alias	OLD-delfin-lvm
 	}
 	multipath {
 		wwid	3600c0ff000d5ad347a49665401000000
 		alias	dillon
 	}
-	multipath {
-		wwid	3600c0ff000d5ad34fc2e665401000000
-		alias	dillon-lvm
-	}
 	multipath {
 		wwid	3600c0ff000d83a70ac13965601000000
 		alias	dillon-lvm2
 	}
 	multipath {
 		wwid	3600c0ff000d5ad3421c3635401000000
-		alias	dinis
+		alias	OLD-dinis
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34dc17115501000000
-		alias	dinis-lvm
+		alias	OLD-dinis-lvm
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34f501655401000000
-		alias	donizetti
+		alias	OLD-donizetti
 	}
 	multipath {
 		wwid	3600c0ff000d5ad346a00655401000000
-		alias	donizetti-srv
-	}
-	multipath {
-		wwid	3600c0ff000d5ad34f780675401000000
-		alias	fede
-	}
-	multipath {
-		wwid	3600c0ff000d5ad341781675401000000
-		alias	fede-lvm
+		alias	OLD-donizetti-srv
 	}
 	multipath {
 		wwid	3600c0ff000d5ad348670635401000000
-		alias	gideon
+		alias	OLD-gideon
 	}
 	multipath {
 		wwid	3600c0ff000d5ad348d70635401000000
-		alias	gideon-srv
-	}
-	multipath {
-		wwid	3600c0ff000d5ad34bcd0635401000000
-		alias	httpredir-bm-01
-	}
-	multipath {
-		wwid	3600c0ff000d75b58ed4d215701000000
-		alias	httpredir-bm-01-srv
-	}
-	multipath {
-		wwid	3600c0ff000d5ad34bf77335501000000
-		alias	jerea
-	}
-	multipath {
-		wwid	3600c0ff000d5ad34c877335501000000
-		alias	jerea-lvm
+		alias	OLD-gideon-srv
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34c76a635401000000
-		alias	lindsay
+		alias	OLD-lindsay
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34e86a635401000000
-		alias	lindsay-srv
-	}
-	multipath {
-		wwid	3600c0ff000d83a70921c115701000000
-		alias	manziarly
-	}
-	multipath {
-		wwid	3600c0ff000d83a709d1c115701000000
-		alias	manziarly-lvm
-	}
-	multipath {
-		wwid	3600c0ff000d5ad34f1f56f5501000000
-		alias	mekeel
+		alias	OLD-lindsay-srv
 	}
 	multipath {
 		wwid	3600c0ff000d5ad341ca4655401000000
 		alias	milanollo
 	}
-	multipath {
-		wwid	3600c0ff000d5ad346921635401000000
-		alias	milanollo-lvm-old
-	}
 	multipath {
 		wwid	3600c0ff000d75b58b9f93d5501000000
 		alias	milanollo-lvm
 	}
-	multipath {
-		wwid	3600c0ff000d5ad3454b3655401000000
-		alias	moszumanska
-	}
-	multipath {
-		wwid	3600c0ff000d5ad34951e635401000000
-		alias	moszumanska-lvm
-	}
-	multipath {
-		wwid	3600c0ff000d5ad342fca635401000000
-		alias	oyens
-	}
-	multipath {
-		wwid	3600c0ff000d5ad3437ca635401000000
-		alias	oyens-srv
-	}
 	multipath {
 		wwid	3600c0ff000d5ad341356645401000000
-		alias	paradis
+		alias	OLD-paradis
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34c0d2635401000000
-		alias	paradis-lvm
+		alias	OLD-paradis-lvm
 	}
 	multipath {
 		wwid	3600c0ff000d5ad341dfb655401000000
-		alias	pejacevic
+		alias	OLD-pejacevic
 	}
 	multipath {
 		wwid	3600c0ff000d5ad3439b7645401000000
-		alias	pejacevic-lvm
+		alias	OLD-pejacevic-lvm
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34e7e9645401000000
-		alias	petrova
+		alias	OLD-petrova
 	}
 	multipath {
 		wwid	3600c0ff000d5ad343c439d5501000000
-		alias	pinel
+		alias	OLD-pinel
 	}
 	multipath {
 		wwid	3600c0ff000d5ad345c439d5501000000
-		alias	pinel-lvm
+		alias	OLD-pinel-lvm
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34e3b4645401000000
-		alias	philp
+		alias	OLD-philp
 	}
 	multipath {
-		wwid	3600c0ff000d5ad348f67675401000000
+		wwid	3600c0ff000d83a709ddc705801000000
 		alias	picconi
 	}
 	multipath {
-		wwid	3600c0ff000d5ad34de57675401000000
+		wwid	3600c0ff000d83a70addc705801000000
 		alias	picconi-lvm
 	}
 	multipath {
@@ -234,19 +158,27 @@ multipaths {
 	}
 	multipath {
 		wwid	3600c0ff000d5ad341aa6645401000000
-		alias	rainier
+		alias	OLD-rainier
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34efa7645401000000
-		alias	rapoport
+		alias	OLD-rapoport
+	}
+	multipath {
+		wwid	3600c0ff000d83a70491c465701000000
+		alias	respighi
+	}
+	multipath {
+		wwid	3600c0ff000d83a70861c465701000000
+		alias	respighi-lvm
 	}
 	multipath {
 		wwid	3600c0ff000d5ad343fe03d5601000000
-		alias	rusca
+		alias	OLD-rusca
 	}
 	multipath {
 		wwid	3600c0ff000d75b5869e03d5601000000
-		alias	rusca-lvm
+		alias	OLD-rusca-lvm
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34b260685401000000
@@ -256,6 +188,10 @@ multipaths {
 		wwid	3600c0ff000d5ad34c3bd675401000000
 		alias	senfter-lvm
 	}
+	multipath {
+		wwid	3600c0ff000d5ad3441148d5801000000
+		alias	senfter-lvm2
+	}
 	multipath {
 		wwid	3600c0ff000d75b58894b825401000000
 		alias	sor
@@ -270,26 +206,10 @@ multipaths {
 	}
 	multipath {
 		wwid	3600c0ff000d5ad346bc46b5401000000
-		alias	ticharich
+		alias	OLD-ticharich
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34169d6b5401000000
-		alias	ticharich-lvm
-	}
-	multipath {
-		wwid	3600c0ff000d5ad3463e4645401000000
-		alias	wuiet
-	}
-	multipath {
-		wwid	3600c0ff000d5ad340ad9635401000000
-		alias	wuiet-lvm
-	}
-	multipath {
-		wwid	3600c0ff000d5ad3442f4645401000000
-		alias	x86-bm-01
-	}
-	multipath {
-		wwid	3600c0ff000d5ad344af4645401000000
-		alias	x86-bm-01-lvm
+		alias	OLD-ticharich-lvm
 	}
 }