X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-ubc-ganeti.conf.erb;h=3ff119966907ede11a209ea4ab571f7ff0cb1119;hb=dbfc5786422b91890346251d5e7ddbd62c9e430c;hp=8edfe7de6e028f2b681b86c86d15528e7ea86ac9;hpb=ebbb077bbd05947b458da7aea18f05c9497c051f;p=dsa-puppet.git

diff --git a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
index 8edfe7de..3ff11996 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 {
@@ -52,15 +52,6 @@ multipaths {
                 wwid 3600c0ff000d5f6bd3ed7995101000000
                 alias r10-geo2
         }
-        # brahms
-        multipath {
-                wwid 3600c0ff000d5f6bdf4fa995101000000
-                alias r10-brahms
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bdfdfa995101000000
-                alias r10-brahms-srv
-        }
         # lotti
         multipath {
                 wwid 3600c0ff000d5f6bd9a2a9a5101000000
@@ -75,19 +66,10 @@ multipaths {
                 wwid 3600c0ff000d5f6bd04849b5101000000
                 alias r10-elgar
         }
-        # jenkins
+        # jenko
         multipath {
                 wwid 3600c0ff000d5f6bdf38f9b5101000000
-                alias r10-jenkins
-        }
-        # popov
-        multipath {
-                wwid 3600c0ff000d5f6bda9a19b5101000000
-                alias r10-popov
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bdaaa19b5101000000
-                alias r10-popov-srv
+                alias r10-jenko
         }
         # fano
         multipath {
@@ -149,6 +131,10 @@ multipaths {
                 wwid 3600c0ff000d5f6bd0944b85101000000
                 alias r10-nono
         }
+        multipath {
+                wwid 3600c0ff000d5f6bd6c75695501000000
+                alias r10-nono-lvm
+        }
         # bizet
         multipath {
                 wwid 3600c0ff000d5f6bdba31435501000000