X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-ubc-ganeti2.conf.erb;h=97f4f6baa816e78146f1d9a87242d860c190fa05;hb=accfb8fd412b17c2b61f9ab1173aad720c8ffd61;hp=c3b4e93ddf28aa641cf086630ce12ec2d8e4979c;hpb=5830a865a00db0d6eeab2a7dc3161f6d47fa3008;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 c3b4e93dd..97f4f6baa 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
@@ -59,14 +59,27 @@ multipaths {
                 alias godard
         }
         multipath {
-                wwid 3600c0ff000277c5f1a05945901000000
-                alias godard-lvm
+                wwid 3600c0ff00027786ca04e035d01000000
+                alias godard-lvm-hdd
+        }
+        multipath {
+                wwid 3600c0ff000277c5ff9b9035d01000000
+                alias godard-lvm-ssd
         }
         # gombert
         multipath {
                 wwid 3600c0ff00027786c9cd8de5701000000
                 alias gombert
         }
+        # grabbe
+        multipath {
+                wwid 3600c0ff00027786c548cdf5a01000000
+                alias grabbe
+        }
+        multipath {
+                wwid 3600c0ff00027786c858cdf5a01000000
+                alias grabbe-lvm
+        }
         # gretchaninov
         multipath {
                 wwid 3600c0ff00027786c85aae35701000000
@@ -85,11 +98,6 @@ multipaths {
                 wwid 3600c0ff00027786c5a8a135901000000
                 alias hier-srv
         }
-        # kantuser
-        multipath {
-                wwid 3600c0ff00027786c6cfa165a01000000
-                alias kantuser
-        }
         # lotti
         multipath {
                 wwid 3600c0ff00027786ca35ee25701000000
@@ -99,6 +107,15 @@ multipaths {
                 wwid 3600c0ff00027786cab5ee25701000000
                 alias lotti-srv
         }
+        # manziarly
+        multipath {
+                wwid 3600c0ff00027786c259d775d01000000
+                alias manziarly
+        }
+        multipath {
+                wwid 3600c0ff00027786c289d775d01000000
+                alias manziarly-lvm
+        }
         # menotti
         multipath {
                 wwid 3600c0ff00027786cec49e05701000000
@@ -146,11 +163,33 @@ multipaths {
                 wwid 3600c0ff00027786cff7ce25701000000
                 alias sonntag
         }
+        # static-master-ubc-01
+        multipath {
+                wwid 3600c0ff00027786c559a785d01000000
+                alias static-master-ubc-01
+        }
+        multipath {
+                wwid 3600c0ff000277c5f1a9b785d01000000
+                alias static-master-ubc-01-lvm-ssd
+        }
+        multipath {
+                wwid 3600c0ff00027786c8c9b785d01000000
+                alias static-master-ubc-01-lvm-hdd
+        }
         # tchaikovsky
         multipath {
                 wwid 3600c0ff00027786cf460e25701000000
                 alias tchaikovsky
         }
+        # trabaci
+        multipath {
+                wwid 3600c0ff00027786cb218965c01000000
+                alias trabaci
+        }
+        multipath {
+                wwid 3600c0ff00027786cb618965c01000000
+                alias trabaci-lvm
+        }
         # tye
         multipath {
                 wwid 3600c0ff00027786c2ecfe35701000000
@@ -169,6 +208,15 @@ multipaths {
                 wwid 3600c0ff000277c5f25cfe35701000000
                 alias ullmann-lvm
         }
+        # wuiet
+        multipath {
+                wwid 3600c0ff00027786c6b867a5d01000000
+                alias wuiet
+        }
+        multipath {
+                wwid 3600c0ff00027786c9b867a5d01000000
+                alias wuiet-lvm
+        }
         # x86-ubc-01
         multipath {
                 wwid 3600c0ff00027786cdc06dd5701000000
@@ -178,4 +226,13 @@ multipaths {
                 wwid 3600c0ff00027786c3137dc5701000000
                 alias x86-ubc-01-lvm
         }
+        # x86-ubc-02
+        multipath {
+                wwid 3600c0ff00027786cd3fc075d01000000
+                alias x86-ubc-02
+        }
+        multipath {
+                wwid 3600c0ff00027786c0cfd075d01000000
+                alias x86-ubc-02-lvm
+       }
 }