Merge branch 'master' of git+ssh://git2.debian.org/dsa/dsa-puppet

[mirror/dsa-puppet.git] / modules / multipath / manifests / init.pp

diff --git a/modules/multipath/manifests/init.pp b/modules/multipath/manifests/init.pp
index e10bea6..5c87418 100644 (file)
--- a/modules/multipath/manifests/init.pp
+++ b/modules/multipath/manifests/init.pp
@@ -1,7 +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'
+               }
+               ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10: {
+                       $conffile = 'multipath-ubc-ganeti2.conf'
                }
                default: {
                        $conffile = ''
@@ -16,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']
                }
        }