X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Fmanifests%2Finit.pp;h=5c87418e3e5d8fc313c66642f08e99b960b8c3f6;hb=f7ba35a5a5b70e8c99deb4e285ce898c875be17e;hp=aca0684058ca9cf50875feca0565dd87d2d11461;hpb=09cea27fc09713eb3c1fbc086937996deb0264c1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/multipath/manifests/init.pp b/modules/multipath/manifests/init.pp
index aca068405..5c87418e3 100644
--- a/modules/multipath/manifests/init.pp
+++ b/modules/multipath/manifests/init.pp
@@ -1,10 +1,18 @@
+# = Class: multipath
+#
+# Manage a multipath installation
+#
+# == Sample Usage:
+#
+#   include multipath
+#
 class multipath {
 	case $::hostname {
 		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 = 'bm-multipath.conf'
+			$conffile = 'multipath-bm.conf'
 		}
-		rossini: {
-			$conffile = 'bm-ubc-ganeti.conf'
+		ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10: {
+			$conffile = 'multipath-ubc-ganeti2.conf'
 		}
 		default: {
 			$conffile = ''
@@ -19,11 +27,11 @@ class multipath {
 			path        => '/usr/bin:/usr/sbin:/bin:/sbin',
 			command     => 'service multipath-tools reload',
 			refreshonly => true,
-			require =>  Package['multipath-tools'],
+			require     =>  Package['multipath-tools'],
 		}
 
 		file { '/etc/multipath.conf':
-			source  => "puppet:///modules/multipath/$conffile",
+			content  => template("multipath/${conffile}.erb"),
 			notify  => Exec['multipath reload']
 		}
 	}