X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-ubc-ganeti2.conf.erb;h=97f4f6baa816e78146f1d9a87242d860c190fa05;hb=07307bc8fa2416ce3b972d891b6fa53d93992a87;hp=8544b78a2141f152857a8e3093a0d9b8a6ba4ee2;hpb=85ede63eeb25ef1c974c80244c8a92b2051f0e42;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 8544b78a2..97f4f6baa 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
@@ -59,8 +59,12 @@ multipaths {
                 alias godard
         }
         multipath {
-                wwid 3600c0ff000277c5f1a05945901000000
-                alias godard-lvm
+                wwid 3600c0ff00027786ca04e035d01000000
+                alias godard-lvm-hdd
+        }
+        multipath {
+                wwid 3600c0ff000277c5ff9b9035d01000000
+                alias godard-lvm-ssd
         }
         # gombert
         multipath {
@@ -103,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
@@ -150,6 +163,19 @@ 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
@@ -182,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
@@ -191,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
+       }
 }