From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 20 May 2013 10:36:22 +0000 (+0200)
Subject: rename multipath files
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b96e9328e5790659f60aa605b7f67001a56aa38e;p=mirror%2Fdsa-puppet.git

rename multipath files
---

diff --git a/modules/multipath/files/bm-multipath.conf b/modules/multipath/files/bm-multipath.conf
deleted file mode 100644
index c16fe1cea..000000000
--- a/modules/multipath/files/bm-multipath.conf
+++ /dev/null
@@ -1,75 +0,0 @@
-##
-## 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
-##
-
-# cut -b 2-
-#         convert_sn() {
-#           local sn a b c d
-#           sn="$1"
-#           if [ -z "$sn" ] ; then read sn; fi
-#           a="${sn%??????????????????????????}"; sn="${sn#??????}"
-#           b="${sn%????????????????????}"; sn="${sn#??????}"
-#           c="${sn%??????????????}"; sn="${sn#??????}"
-#           d="$sn"
-#
-#           if [ "${c#0000}" = "$c" ]; then
-#             echo >&2 "sn has unexpected value ($1: $a - $b - $c - $d)"
-#             return 1
-#           fi
-#
-#           echo "36${a}000${b}${c#0000}${d}"
-#           return 0
-#         }
-
-
-blacklist_exceptions {
-	devnode "cciss!c[0-9]d[0-9]*"
-}
-
-multipaths {
-	multipath {
-		wwid    3600c0ff000d75b58409f695101000000
-		alias   milanollo
-	}
-	multipath {
-		wwid    3600c0ff000d75b585d026b5101000000
-		alias   milanollo-srv
-	}
-	multipath {
-		wwid    3600c0ff000d5ad34b7036b5101000000
-		alias   picconi
-	}
-	multipath {
-		wwid    3600c0ff000d5ad34c5036b5101000000
-		alias   picconi-srv
-	}
-	multipath {
-		wwid    3600c0ff000d5ad34f1b76d5101000000
-		alias   senfter-srv
-	}
-	multipath {
-		wwid    3600c0ff000d5ad34cab76d5101000000
-		alias   senfter
-	}
-	multipath {
-		wwid    3600c0ff000d75b581d02705101000000
-		alias   adayevskaya
-	}
-	multipath {
-		wwid    3600c0ff000d75b58acb28a5101000000
-		alias   pejacevic-srv
-	}
-	multipath {
-		wwid    3600c0ff000d5ad3402a28a5101000000
-		alias   pejacevic
-	}
-	multipath {
-		wwid    3600c0ff000d5ad34eab58f5101000000
-		alias   piu-slave-bm-a
-	}
-	multipath {
-		wwid    3600c0ff000d5ad34fdb58f5101000000
-		alias   piu-slave-bm-a-swap
-	}
-}
diff --git a/modules/multipath/files/bm-ubc-ganeti.conf b/modules/multipath/files/bm-ubc-ganeti.conf
deleted file mode 100644
index e8e9087fb..000000000
--- a/modules/multipath/files/bm-ubc-ganeti.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-##
-## 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#'
-
-defaults {
-        udev_dir                /dev
-        polling_interval        10
-        path_selector           "round-robin 0"
-        path_grouping_policy    multibus
-        getuid_callout          "/lib/udev/scsi_id -g -u -s /block/%n"
-        path_checker            readsector0
-        rr_min_io               100
-        rr_weight               priorities
-        failback                immediate
-        no_path_retry           fail
-        user_friendly_names     yes
-}
-blacklist {
-        devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*"
-        devnode "^hd[a-z][[0-9]*]"
-        devnode "^vd[a-z]"
-        devnode "^cciss!c[0-9]d[0-9]*[p[0-9]*]"
-        device {
-                vendor DEC.*
-                product MSA[15]00
-        }
-}
-multipaths {
-        multipath {
-                wwid 3600c0ff000d5f6bdedbe744e01000000
-                alias ganeti-mini
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bd5dabd64c01000000
-                alias reger-boot
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bd72ac375101000000
-                alias r10-reger-root
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bd8ca3735101000000
-                alias fischer-root
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bd2af5de4f01000000
-                alias fischer-srv
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bd3ed7995101000000
-                alias r10-geo2
-        }
-}
diff --git a/modules/multipath/files/multipath-bm.conf b/modules/multipath/files/multipath-bm.conf
new file mode 100644
index 000000000..c16fe1cea
--- /dev/null
+++ b/modules/multipath/files/multipath-bm.conf
@@ -0,0 +1,75 @@
+##
+## 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
+##
+
+# cut -b 2-
+#         convert_sn() {
+#           local sn a b c d
+#           sn="$1"
+#           if [ -z "$sn" ] ; then read sn; fi
+#           a="${sn%??????????????????????????}"; sn="${sn#??????}"
+#           b="${sn%????????????????????}"; sn="${sn#??????}"
+#           c="${sn%??????????????}"; sn="${sn#??????}"
+#           d="$sn"
+#
+#           if [ "${c#0000}" = "$c" ]; then
+#             echo >&2 "sn has unexpected value ($1: $a - $b - $c - $d)"
+#             return 1
+#           fi
+#
+#           echo "36${a}000${b}${c#0000}${d}"
+#           return 0
+#         }
+
+
+blacklist_exceptions {
+	devnode "cciss!c[0-9]d[0-9]*"
+}
+
+multipaths {
+	multipath {
+		wwid    3600c0ff000d75b58409f695101000000
+		alias   milanollo
+	}
+	multipath {
+		wwid    3600c0ff000d75b585d026b5101000000
+		alias   milanollo-srv
+	}
+	multipath {
+		wwid    3600c0ff000d5ad34b7036b5101000000
+		alias   picconi
+	}
+	multipath {
+		wwid    3600c0ff000d5ad34c5036b5101000000
+		alias   picconi-srv
+	}
+	multipath {
+		wwid    3600c0ff000d5ad34f1b76d5101000000
+		alias   senfter-srv
+	}
+	multipath {
+		wwid    3600c0ff000d5ad34cab76d5101000000
+		alias   senfter
+	}
+	multipath {
+		wwid    3600c0ff000d75b581d02705101000000
+		alias   adayevskaya
+	}
+	multipath {
+		wwid    3600c0ff000d75b58acb28a5101000000
+		alias   pejacevic-srv
+	}
+	multipath {
+		wwid    3600c0ff000d5ad3402a28a5101000000
+		alias   pejacevic
+	}
+	multipath {
+		wwid    3600c0ff000d5ad34eab58f5101000000
+		alias   piu-slave-bm-a
+	}
+	multipath {
+		wwid    3600c0ff000d5ad34fdb58f5101000000
+		alias   piu-slave-bm-a-swap
+	}
+}
diff --git a/modules/multipath/files/multipath-ubc-ganeti.conf b/modules/multipath/files/multipath-ubc-ganeti.conf
new file mode 100644
index 000000000..e8e9087fb
--- /dev/null
+++ b/modules/multipath/files/multipath-ubc-ganeti.conf
@@ -0,0 +1,58 @@
+##
+## 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#'
+
+defaults {
+        udev_dir                /dev
+        polling_interval        10
+        path_selector           "round-robin 0"
+        path_grouping_policy    multibus
+        getuid_callout          "/lib/udev/scsi_id -g -u -s /block/%n"
+        path_checker            readsector0
+        rr_min_io               100
+        rr_weight               priorities
+        failback                immediate
+        no_path_retry           fail
+        user_friendly_names     yes
+}
+blacklist {
+        devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*"
+        devnode "^hd[a-z][[0-9]*]"
+        devnode "^vd[a-z]"
+        devnode "^cciss!c[0-9]d[0-9]*[p[0-9]*]"
+        device {
+                vendor DEC.*
+                product MSA[15]00
+        }
+}
+multipaths {
+        multipath {
+                wwid 3600c0ff000d5f6bdedbe744e01000000
+                alias ganeti-mini
+        }
+        multipath {
+                wwid 3600c0ff000d5f6bd5dabd64c01000000
+                alias reger-boot
+        }
+        multipath {
+                wwid 3600c0ff000d5f6bd72ac375101000000
+                alias r10-reger-root
+        }
+        multipath {
+                wwid 3600c0ff000d5f6bd8ca3735101000000
+                alias fischer-root
+        }
+        multipath {
+                wwid 3600c0ff000d5f6bd2af5de4f01000000
+                alias fischer-srv
+        }
+        multipath {
+                wwid 3600c0ff000d5f6bd3ed7995101000000
+                alias r10-geo2
+        }
+}
diff --git a/modules/multipath/manifests/init.pp b/modules/multipath/manifests/init.pp
index aca068405..0e6ba3ba1 100644
--- a/modules/multipath/manifests/init.pp
+++ b/modules/multipath/manifests/init.pp
@@ -1,10 +1,10 @@
 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'
+			$conffile = 'multipath-ubc-ganeti.conf'
 		}
 		default: {
 			$conffile = ''