X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-ubc-ganeti2.conf.erb;h=96366902f082a95c9f2275be24c51fccbc6b7b02;hb=641098e35e24105f32455690d0d90db1128ff15a;hp=4a9ca3e4b9bf1dbecb4bf6c95b5061ba92c433e2;hpb=a4618f6c9c7459d890972787e1d48e151dc60a64;p=mirror%2Fdsa-puppet.git

diff --git a/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb b/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
index 4a9ca3e4b..96366902f 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
@@ -15,6 +15,15 @@ blacklist {
         devnode "^sda[0-9]*$"
 }
 multipaths {
+        # buxtehude
+        multipath {
+                wwid 3600c0ff00027786c0a0de45701000000
+                alias buxtehude
+        }
+        multipath {
+                wwid 3600c0ff000277c5f100de45701000000
+                alias buxtehude-lvm
+        }
         # danzi
         multipath {
                 wwid 3600c0ff00027786ca059e15701000000
@@ -24,6 +33,11 @@ multipaths {
                 wwid 3600c0ff000277c5fa859e15701000000
                 alias danzi-srv
         }
+        # debussy
+        multipath {
+                wwid 3600c0ff00027786c1541ce5901000000
+                alias debussy
+        }
         # diabelli
         multipath {
                 wwid 3600c0ff00027786cba48e05701000000
@@ -34,33 +48,33 @@ multipaths {
                 wwid 3600c0ff00027786c2ed8de5701000000
                 alias elgar
         }
-        # fano
+        # geo2
         multipath {
-                wwid 3600c0ff00027786c54b7de5701000000
-                alias fano
+                wwid 3600c0ff00027786cbf5ee25701000000
+                alias geo2
         }
+        # godard
         multipath {
-                wwid 3600c0ff00027786c80b7de5701000000
-                alias fano-srv
+                wwid 3600c0ff000277c5f1305945901000000
+                alias godard
         }
-        # finzi
         multipath {
-                wwid 3600c0ff00027786cbe4cdd5701000000
-                alias finzi
+                wwid 3600c0ff00027786ca04e035d01000000
+                alias godard-lvm-hdd
         }
+        # gombert
         multipath {
-                wwid 3600c0ff00027786c874edd5701000000
-                alias finzi-srv
+                wwid 3600c0ff00027786c9cd8de5701000000
+                alias gombert
         }
-        # geo2
+        # grabbe
         multipath {
-                wwid 3600c0ff00027786cbf5ee25701000000
-                alias geo2
+                wwid 3600c0ff00027786c548cdf5a01000000
+                alias grabbe
         }
-        # gombert
         multipath {
-                wwid 3600c0ff00027786c9cd8de5701000000
-                alias gombert
+                wwid 3600c0ff00027786c858cdf5a01000000
+                alias grabbe-lvm
         }
         # gretchaninov
         multipath {
@@ -71,6 +85,15 @@ multipaths {
                 wwid 3600c0ff00027786cefaae35701000000
                 alias gretchaninov-srv
         }
+        # hier
+        multipath {
+                wwid 3600c0ff00027786c588a135901000000
+                alias hier
+        }
+        multipath {
+                wwid 3600c0ff00027786c5a8a135901000000
+                alias hier-srv
+        }
         # lotti
         multipath {
                 wwid 3600c0ff00027786ca35ee25701000000
@@ -103,6 +126,15 @@ multipaths {
                 wwid 3600c0ff00027786c0a49e05701000000
                 alias nono-lvm
         }
+        # piu-slave-ubc-01
+        multipath {
+                wwid 3600c0ff00027786cd29cb15801000000
+                alias piu-slave-ubc-01
+        }
+        multipath {
+                wwid 3600c0ff00027786ce59cb15801000000
+                alias piu-slave-ubc-01-swap
+        }
         # rachmaninoff
         multipath {
                 wwid 3600c0ff000277c5f4505d15701000000
@@ -123,6 +155,33 @@ multipaths {
                 wwid 3600c0ff00027786cf460e25701000000
                 alias tchaikovsky
         }
+        # trabaci
+        multipath {
+                wwid 3600c0ff00027786cb218965c01000000
+                alias trabaci
+        }
+        multipath {
+                wwid 3600c0ff00027786cb618965c01000000
+                alias trabaci-lvm
+        }
+        # tye
+        multipath {
+                wwid 3600c0ff00027786c2ecfe35701000000
+                alias tye
+        }
+        multipath {
+                wwid 3600c0ff00027786c39cfe35701000000
+                alias tye-srv
+                }
+        # ullmann
+        multipath {
+                wwid 3600c0ff00027786c21cfe35701000000
+                alias ullmann
+        }
+        multipath {
+                wwid 3600c0ff000277c5f25cfe35701000000
+                alias ullmann-lvm
+        }
         # x86-ubc-01
         multipath {
                 wwid 3600c0ff00027786cdc06dd5701000000