X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Ffiles%2Fmultipath-bm.conf;h=23ff98aebfcdfaa6f3a3ba2e2d7add16682bd291;hb=b33b218ab9767ea5514c065428beccee1fba9ead;hp=c16fe1cea1c66fb5296934c57fe9bb17b354e716;hpb=b96e9328e5790659f60aa605b7f67001a56aa38e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/multipath/files/multipath-bm.conf b/modules/multipath/files/multipath-bm.conf
index c16fe1cea..23ff98aeb 100644
--- a/modules/multipath/files/multipath-bm.conf
+++ b/modules/multipath/files/multipath-bm.conf
@@ -3,25 +3,9 @@
 ## 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"
+# conversion from MSA stype WWIDs to multipathd.conf:
 #
-#           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
-#         }
-
+#   sed -re 's#(.{6})(.{6})0000(.{2})(.*)#36\1000\2\3\4#'
 
 blacklist_exceptions {
 	devnode "cciss!c[0-9]d[0-9]*"
@@ -72,4 +56,12 @@ multipaths {
 		wwid    3600c0ff000d5ad34fdb58f5101000000
 		alias   piu-slave-bm-a-swap
 	}
+	multipath {
+		wwid    3600c0ff000d5ad34a381a75101000000
+		alias   binet
+	}
+	multipath {
+		wwid    3600c0ff000d5ad34b181a75101000000
+		alias   binet-lvm
+	}
 }