X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-bm.conf.erb;h=7c118e76a3f1c01ceb42b7bd053c398b0689969c;hb=86d2f1f8239999b832a0ffa0debb815c2f6a4250;hp=3f39ebb48acad14458b3928bdd30ffb2a201c3c6;hpb=d4fb891a1a7d58fdeff2687e91f5e6faf822a96c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/multipath/templates/multipath-bm.conf.erb b/modules/multipath/templates/multipath-bm.conf.erb
index 3f39ebb48..7c118e76a 100644
--- a/modules/multipath/templates/multipath-bm.conf.erb
+++ b/modules/multipath/templates/multipath-bm.conf.erb
@@ -16,6 +16,14 @@ multipaths {
 		wwid	3600c0ff000d5ad34b41a635401000000
 		alias	adayevskaya
 	}
+	multipath {
+		wwid	3600c0ff000d5ad34d7d8fa5501000000
+		alias	backuphost
+	}
+	multipath {
+		wwid	3600c0ff000d838e2e7d8fa5501000000
+		alias	backuphost-lvm
+	}
 	multipath {
 		wwid	3600c0ff000d5ad346d96635401000000
 		alias	barriere
@@ -37,8 +45,12 @@ multipaths {
 		alias	bmdb1
 	}
 	multipath {
-		wwid	3600c0ff000d83a704c2ed85101000000
-		alias	bmdb1-srv
+		wwid	3600c0ff000d5ad346dea825601000000
+		alias	bmdb1-lvm
+	}
+	multipath {
+		wwid	3600c0ff000d83a70d912965601000000
+		alias	bmdb1-lvm2
 	}
 	multipath {
 		wwid	3600c0ff000d5ad34f874635401000000
@@ -48,21 +60,13 @@ multipaths {
 		wwid	3600c0ff000d5ad34ac83635401000000
 		alias	coccia-lvm
 	}
-	multipath {
-		wwid	3600c0ff000d5ad34cd996b5401000000
-		alias	couper
-	}
-	multipath {
-		wwid	3600c0ff000d83a7048ef105201000000
-		alias	couper-srv
-	}
 	multipath {
 		wwid	3600c0ff000d5ad34389b6b5401000000
 		alias	delfin
 	}
 	multipath {
-		wwid	3600c0ff000d83a701052235201000000
-		alias	delfin-srv
+		wwid	3600c0ff000d5ad34aafd825601000000
+		alias	delfin-lvm
 	}
 	multipath {
 		wwid	3600c0ff000d5ad347a49665401000000
@@ -72,6 +76,10 @@ multipaths {
 		wwid	3600c0ff000d5ad34fc2e665401000000
 		alias	dillon-lvm
 	}
+	multipath {
+		wwid	3600c0ff000d83a70ac13965601000000
+		alias	dillon-lvm2
+	}
 	multipath {
 		wwid	3600c0ff000d5ad3421c3635401000000
 		alias	dinis
@@ -108,6 +116,10 @@ multipaths {
 		wwid	3600c0ff000d5ad34bcd0635401000000
 		alias	httpredir-bm-01
 	}
+	multipath {
+		wwid	3600c0ff000d75b58ed4d215701000000
+		alias	httpredir-bm-01-srv
+	}
 	multipath {
 		wwid	3600c0ff000d5ad34bf77335501000000
 		alias	jerea
@@ -124,6 +136,14 @@ multipaths {
 		wwid	3600c0ff000d5ad34e86a635401000000
 		alias	lindsay-srv
 	}
+	multipath {
+		wwid	3600c0ff000d83a70921c115701000000
+		alias	manziarly
+	}
+	multipath {
+		wwid	3600c0ff000d83a709d1c115701000000
+		alias	manziarly-lvm
+	}
 	multipath {
 		wwid	3600c0ff000d5ad34f1f56f5501000000
 		alias	mekeel
@@ -132,10 +152,6 @@ multipaths {
 		wwid	3600c0ff000d5ad341ca4655401000000
 		alias	milanollo
 	}
-	multipath {
-		wwid	3600c0ff000d5ad346921635401000000
-		alias	milanollo-lvm-old
-	}
 	multipath {
 		wwid	3600c0ff000d75b58b9f93d5501000000
 		alias	milanollo-lvm
@@ -148,6 +164,10 @@ multipaths {
 		wwid	3600c0ff000d5ad34951e635401000000
 		alias	moszumanska-lvm
 	}
+	multipath {
+		wwid	3600c0ff000d83a707ec2985701000000
+		alias	olin
+	}
 	multipath {
 		wwid	3600c0ff000d5ad342fca635401000000
 		alias	oyens
@@ -176,6 +196,14 @@ multipaths {
 		wwid	3600c0ff000d5ad34e7e9645401000000
 		alias	petrova
 	}
+	multipath {
+		wwid	3600c0ff000d5ad343c439d5501000000
+		alias	pinel
+	}
+	multipath {
+		wwid	3600c0ff000d5ad345c439d5501000000
+		alias	pinel-lvm
+	}
 	multipath {
 		wwid	3600c0ff000d5ad34e3b4645401000000
 		alias	philp
@@ -188,14 +216,6 @@ multipaths {
 		wwid	3600c0ff000d5ad34de57675401000000
 		alias	picconi-lvm
 	}
-	multipath {
-		wwid	3600c0ff000d5ad346501705501000000
-		alias	pittar
-	}
-	multipath {
-		wwid	3600c0ff000d5ad347c01705501000000
-		alias	pittar-lvm
-	}
 	multipath {
 		wwid	3600c0ff000d5ad345cee645401000000
 		alias	piu-slave-bm-a
@@ -204,14 +224,6 @@ multipaths {
 		wwid	3600c0ff000d5ad3465ee645401000000
 		alias	piu-slave-bm-a-swap
 	}
-	multipath {
-		wwid	3600c0ff000d5ad34c6ae6b5401000000
-		alias	portman
-	}
-	multipath {
-		wwid	3600c0ff000d5ad341e9d6b5401000000
-		alias	portman-lvm
-	}
 	multipath {
 		wwid	3600c0ff000d5ad34fa5d6a5401000000
 		alias	quantz
@@ -228,6 +240,22 @@ multipaths {
 		wwid	3600c0ff000d5ad34efa7645401000000
 		alias	rapoport
 	}
+	multipath {
+		wwid	3600c0ff000d83a70491c465701000000
+		alias	respighi
+	}
+	multipath {
+		wwid	3600c0ff000d83a70861c465701000000
+		alias	respighi-lvm
+	}
+	multipath {
+		wwid	3600c0ff000d5ad343fe03d5601000000
+		alias	rusca
+	}
+	multipath {
+		wwid	3600c0ff000d75b5869e03d5601000000
+		alias	rusca-lvm
+	}
 	multipath {
 		wwid	3600c0ff000d5ad34b260685401000000
 		alias	senfter
@@ -244,6 +272,10 @@ multipaths {
 		wwid	3600c0ff000d75b58264c825401000000
 		alias	sor-lvm
 	}
+	multipath {
+		wwid	3600c0ff000d83a703b2dae5601000000
+		alias	tate
+	}
 	multipath {
 		wwid	3600c0ff000d5ad346bc46b5401000000
 		alias	ticharich