X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-ubc-ganeti.conf.erb;h=267442879f7a86abd2a61f1b9d757d7453f78d6a;hb=ce4abf34eea6d7f988e2a0757fd84d193bccfb0e;hp=9dbf70347aabefcbdfd794ddae2292b9e074b2d8;hpb=b95ee15517a837361004ae2623447cbfc98aa479;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 9dbf70347..267442879 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
@@ -25,7 +25,7 @@ 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 -%>
+<%- if %w{ubc-bl7 ubc-bl3 ubc-bl6 ubc-bl2}.include?(hostname) then -%>
         devnode "^sda[0-9]*$"
 <%- end -%>
         device {
@@ -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
@@ -89,15 +80,6 @@ multipaths {
                 wwid 3600c0ff000d5f6bdf38f9b5101000000
                 alias r10-jenkins
         }
-        # popov
-        multipath {
-                wwid 3600c0ff000d5f6bda9a19b5101000000
-                alias r10-popov
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bdaaa19b5101000000
-                alias r10-popov-srv
-        }
         # fano
         multipath {
                 wwid 3600c0ff000d5f6bd71c19c5101000000
@@ -126,11 +108,6 @@ multipaths {
                 wwid 3600c0ff000d5f6bd318a9e5101000000
                 alias r10-gombert
         }
-        # blavet
-        multipath {
-                wwid 3600c0ff000d5f6bd736aa05101000000
-                alias r10-blavet
-        }
         # tye
         multipath {
                 wwid 3600c0ff000d5f6bdb08aa05101000000
@@ -163,4 +140,17 @@ multipaths {
                 wwid 3600c0ff000d5f6bd0944b85101000000
                 alias r10-nono
         }
+        multipath {
+                wwid 3600c0ff000d5f6bd6c75695501000000
+                alias r10-nono-lvm
+        }
+        # bizet
+        multipath {
+                wwid 3600c0ff000d5f6bdba31435501000000
+                alias r10-bizet
+        }
+        multipath {
+                wwid 3600c0ff000d5f6bdc5d83f4f01000000
+                alias bizet-srv
+        }
 }