X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-ubc-ganeti.conf.erb;h=3ff119966907ede11a209ea4ab571f7ff0cb1119;hb=521f2b44087bbe30746020a2aba93f317995791a;hp=eba65ab6e652d3116aa43a5b2de170fd2569783e;hpb=b319b9f348a4deaf87aae506d23133e3c2086e79;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 eba65ab6e..3ff119966 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
@@ -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