X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-ubc-ganeti.conf.erb;h=4327b9a0dc027302b096ec714df12c665bfdc24b;hb=e8862bd29c97afcdf772f9c689948e958ae71295;hp=016d349bea142d3eda75e361604d81fb753c174e;hpb=8980a5a4c1e7dc6ea14a49b42333b9c4c82ff329;p=mirror%2Fdsa-puppet.git

diff --git a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
index 016d349be..4327b9a0d 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
@@ -25,8 +25,8 @@ blacklist {
         devnode "^hd[a-z][[0-9]*]"
         devnode "^vd[a-z]"
         devnode "^cciss!c[0-9]d[0-9]*[p[0-9]*]"
-<%- if %w{pasquini tristano boito bertali}.include?(hostname) then -%>
-        devnode "^sda[0-9]*"
+<%- if %w{pasquini ubc-bl3 boito ubc-bl2}.include?(hostname) then -%>
+        devnode "^sda[0-9]*$"
 <%- end -%>
         device {
                 vendor DEC.*
@@ -70,15 +70,6 @@ multipaths {
                 wwid 3600c0ff000d5f6bd1ab08c4c01000000
                 alias r6-lotti-srv
         }
-        # lilburn
-        multipath {
-                wwid 3600c0ff000d5f6bd40329a5101000000
-                alias r10-lilburn
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bd46329a5101000000
-                alias r10-lilburn-srv
-        }
         # elgar
         multipath {
                 wwid 3600c0ff000d5f6bd04849b5101000000
@@ -126,11 +117,6 @@ multipaths {
                 wwid 3600c0ff000d5f6bd318a9e5101000000
                 alias r10-gombert
         }
-        # blavet
-        multipath {
-                wwid 3600c0ff000d5f6bd736aa05101000000
-                alias r10-blavet
-        }
         # tye
         multipath {
                 wwid 3600c0ff000d5f6bdb08aa05101000000
@@ -163,4 +149,13 @@ multipaths {
                 wwid 3600c0ff000d5f6bd0944b85101000000
                 alias r10-nono
         }
+        # bizet
+        multipath {
+                wwid 3600c0ff000d5f6bdba31435501000000
+                alias r10-bizet
+        }
+        multipath {
+                wwid 3600c0ff000d5f6bdc5d83f4f01000000
+                alias bizet-srv
+        }
 }