X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-ubc-ganeti2.conf.erb;h=c1e18effa43d0011373f4478aab66959ef50f081;hb=0708835d2991342b11306253cc2e06e71f26c306;hp=e21f7312e8516440b94c84cf7b41441131a39a1d;hpb=ce185de85e44360d9b734b0a4e78c2aa86a8aaa8;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 e21f7312e..c1e18effa 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
@@ -43,6 +43,15 @@ multipaths {
                 wwid 3600c0ff00027786cba48e05701000000
                 alias diabelli
         }
+        # donizetti
+        multipath {
+                wwid 3600c0ff00027786cf4a0875d01000000
+                alias donizetti
+        }
+        multipath {
+                wwid 3600c0ff00027786cfea0875d01000000
+                alias donizetti-lvm
+        }
         # elgar
         multipath {
                 wwid 3600c0ff00027786c2ed8de5701000000
@@ -59,8 +68,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 {
@@ -94,10 +107,23 @@ multipaths {
                 wwid 3600c0ff00027786c5a8a135901000000
                 alias hier-srv
         }
-        # kantuser
+        # jerea
+        multipath {
+                wwid 3600c0ff00027786c4ad9885d01000000
+                alias jerea
+        }
+        multipath {
+                wwid 3600c0ff00027786c7dd9885d01000000
+                alias jerea-lvm
+        }
+        # lindsay
+        multipath {
+                wwid 3600c0ff00027786ccb06865d01000000
+                alias lindsay
+        }
         multipath {
-                wwid 3600c0ff00027786c6cfa165a01000000
-                alias kantuser
+                wwid 3600c0ff00027786ce706865d01000000
+                alias lindsay-lvm
         }
         # lotti
         multipath {
@@ -108,6 +134,15 @@ multipaths {
                 wwid 3600c0ff00027786cab5ee25701000000
                 alias lotti-srv
         }
+        # manziarly
+        multipath {
+                wwid 3600c0ff00027786c259d775d01000000
+                alias manziarly
+        }
+        multipath {
+                wwid 3600c0ff00027786c289d775d01000000
+                alias manziarly-lvm
+        }
         # menotti
         multipath {
                 wwid 3600c0ff00027786cec49e05701000000
@@ -131,6 +166,20 @@ multipaths {
                 wwid 3600c0ff00027786c0a49e05701000000
                 alias nono-lvm
         }
+        # pinel
+        multipath {
+                wwid 3600c0ff00027786c2c07865d01000000
+                alias pinel
+        }
+        multipath {
+                wwid 3600c0ff00027786c4f07865d01000000
+                alias pinel-lvm
+        }
+        # philp
+        multipath {
+                wwid 3600c0ff00027786c2a30825d01000000
+                alias philp
+        }
         # piu-slave-ubc-01
         multipath {
                 wwid 3600c0ff00027786cd29cb15801000000
@@ -155,11 +204,42 @@ 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
         }
+        # ticharich
+        multipath {
+                wwid 3600c0ff00027786cfe68875d01000000
+                alias ticharich
+        }
+        multipath {
+                wwid 3600c0ff00027786c0a69875d01000000
+                alias ticharich-lvm
+        }
+        # trabaci
+        multipath {
+                wwid 3600c0ff00027786cb218965c01000000
+                alias trabaci
+        }
+        multipath {
+                wwid 3600c0ff00027786cb618965c01000000
+                alias trabaci-lvm
+        }
         # tye
         multipath {
                 wwid 3600c0ff00027786c2ecfe35701000000
@@ -178,6 +258,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
@@ -187,4 +276,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
+       }
 }