redo blade assignment to multipath configs

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/multipath/files/multipath-bm-os.conf b/modules/multipath/files/multipath-bm-os.conf
new file mode 100644 (file)
index 0000000..eab81f5
--- /dev/null
+++ b/modules/multipath/files/multipath-bm-os.conf
@@ -0,0 +1,19 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+# conversion from MSA stype WWIDs to multipathd.conf:
+#
+#   sed -re 's#(.{6})(.{6})0000(.{2})(.*)#36\1000\2\3\4#'
+
+blacklist_exceptions {
+       devnode "cciss!c[0-9]d[0-9]*"
+}
+
+multipaths {
+       multipath {
+               wwid    3600c0ff000d83a70b613585301000000
+               alias   openstack
+       }
+}

diff --git a/modules/multipath/files/multipath-bm.conf b/modules/multipath/files/multipath-bm.conf
index afd541a840d12d6b4b6ecafa1531a1d08c92e32e..cb8cb3603cc148d494c16995444532e6227dcb0e 100644 (file)
--- a/modules/multipath/files/multipath-bm.conf
+++ b/modules/multipath/files/multipath-bm.conf
@@ -120,10 +120,6 @@ multipaths {
                wwid    3600c0ff000d75b5820dd4e5301000000
                alias   oyens
        }
-       multipath {
-               wwid    3600c0ff000d83a70b613585301000000
-               alias   openstack
-       }
        multipath {
                wwid    3600c0ff000d5ad3402a28a5101000000
                alias   pejacevic

diff --git a/modules/multipath/manifests/init.pp b/modules/multipath/manifests/init.pp
index 1262ea185c574585f68f5ac726845bfb8b0abf8c..0056dd12e0413656a5cca585b39d5c23308dc5d7 100644 (file)
--- a/modules/multipath/manifests/init.pp
+++ b/modules/multipath/manifests/init.pp
@@ -1,6 +1,17 @@
+# = 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: {
+               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: {
                        $conffile = 'multipath-bm.conf'
                }
                dijkstra,luchesi,rossini,salieri: {
@@ -19,11 +30,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",
+                       source  => "puppet:///modules/multipath/${conffile}",
                        notify  => Exec['multipath reload']
                }
        }