X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Fmanifests%2Finit.pp;h=ee6f8c4f7978b028c0ed8e8d90e9d61059679053;hb=32af51c0ce0cccd69e4194ca25d17cb562640f55;hp=0056dd12e0413656a5cca585b39d5c23308dc5d7;hpb=8911504fb6445217ec8a2a22dd0beb559c992798;p=mirror%2Fdsa-puppet.git

diff --git a/modules/multipath/manifests/init.pp b/modules/multipath/manifests/init.pp
index 0056dd12e..ee6f8c4f7 100644
--- a/modules/multipath/manifests/init.pp
+++ b/modules/multipath/manifests/init.pp
@@ -8,15 +8,15 @@
 #
 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,bm-bl13,bm-bl14: {
 			$conffile = 'multipath-bm.conf'
 		}
-		dijkstra,luchesi,rossini,salieri: {
+		ubc-bl8,ubc-bl4,ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6: {
 			$conffile = 'multipath-ubc-ganeti.conf'
 		}
+		ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10: {
+			$conffile = 'multipath-ubc-ganeti2.conf'
+		}
 		default: {
 			$conffile = ''
 		}
@@ -34,7 +34,7 @@ class multipath {
 		}
 
 		file { '/etc/multipath.conf':
-			source  => "puppet:///modules/multipath/${conffile}",
+			content  => template("multipath/${conffile}.erb"),
 			notify  => Exec['multipath reload']
 		}
 	}