X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmultipath%2Ftemplates%2Fmultipath-ubc-ganeti2.conf.erb;h=2a1427edd5f299f482c049124d8e5778b604dbce;hb=a7016fcb7d27ba652c9bbcf800021000c2c17420;hp=74f05120541fabeac9b56eb70f236681e08c06f3;hpb=33397101fdded2f7c0b5aed18a2a931736e8c1fd;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 74f051205..2a1427edd 100644
--- a/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti2.conf.erb
@@ -24,6 +24,15 @@ multipaths {
                 wwid 3600c0ff000277c5f100de45701000000
                 alias buxtehude-lvm
         }
+        # coccia
+        multipath {
+                wwid 3600c0ff000277c5f5ff69a5d01000000
+                alias coccia
+        }
+        multipath {
+                wwid 3600c0ff00027786c62f69a5d01000000
+                alias coccia-lvm
+        }
         # danzi
         multipath {
                 wwid 3600c0ff00027786ca059e15701000000
@@ -38,33 +47,33 @@ multipaths {
                 wwid 3600c0ff00027786c1541ce5901000000
                 alias debussy
         }
-        # diabelli
+        # delfin
         multipath {
-                wwid 3600c0ff00027786cba48e05701000000
-                alias diabelli
+                wwid 3600c0ff000277c5f12398f5d01000000
+                alias delfin
         }
-        # elgar
         multipath {
-                wwid 3600c0ff00027786c2ed8de5701000000
-                alias elgar
+                wwid 3600c0ff00027786c6a398f5d01000000
+                alias delfin-lvm
         }
-        # fano
+        # diabelli
         multipath {
-                wwid 3600c0ff00027786c54b7de5701000000
-                alias fano
+                wwid 3600c0ff00027786cba48e05701000000
+                alias diabelli
         }
+        # donizetti
         multipath {
-                wwid 3600c0ff00027786c80b7de5701000000
-                alias fano-srv
+                wwid 3600c0ff00027786cf4a0875d01000000
+                alias donizetti
         }
-        # finzi
         multipath {
-                wwid 3600c0ff00027786cbe4cdd5701000000
-                alias finzi
+                wwid 3600c0ff00027786cfea0875d01000000
+                alias donizetti-lvm
         }
+        # elgar
         multipath {
-                wwid 3600c0ff00027786c874edd5701000000
-                alias finzi-srv
+                wwid 3600c0ff00027786c2ed8de5701000000
+                alias elgar
         }
         # geo2
         multipath {
@@ -77,14 +86,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
@@ -103,6 +125,24 @@ multipaths {
                 wwid 3600c0ff00027786c5a8a135901000000
                 alias hier-srv
         }
+        # jerea
+        multipath {
+                wwid 3600c0ff00027786c4ad9885d01000000
+                alias jerea
+        }
+        multipath {
+                wwid 3600c0ff00027786c7dd9885d01000000
+                alias jerea-lvm
+        }
+        # lindsay
+        multipath {
+                wwid 3600c0ff00027786ccb06865d01000000
+                alias lindsay
+        }
+        multipath {
+                wwid 3600c0ff00027786ce706865d01000000
+                alias lindsay-lvm
+        }
         # lotti
         multipath {
                 wwid 3600c0ff00027786ca35ee25701000000
@@ -112,6 +152,24 @@ multipaths {
                 wwid 3600c0ff00027786cab5ee25701000000
                 alias lotti-srv
         }
+        # manziarly
+        multipath {
+                wwid 3600c0ff00027786c259d775d01000000
+                alias manziarly
+        }
+        multipath {
+                wwid 3600c0ff00027786c289d775d01000000
+                alias manziarly-lvm
+        }
+        # mekeel
+        multipath {
+                wwid 3600c0ff000277c5f98a28d5d01000000
+                alias mekeel
+        }
+        multipath {
+                wwid 3600c0ff00027786c25a48d5d01000000
+                alias mekeel-lvm
+        }
         # menotti
         multipath {
                 wwid 3600c0ff00027786cec49e05701000000
@@ -135,6 +193,38 @@ multipaths {
                 wwid 3600c0ff00027786c0a49e05701000000
                 alias nono-lvm
         }
+        # paradis
+        multipath {
+                wwid 3600c0ff00027786c821d895d01000000
+                alias paradis
+        }
+        multipath {
+                wwid 3600c0ff00027786c8c1d895d01000000
+                alias paradis-lvm
+        }
+        # pejacevic
+        multipath {
+                wwid 3600c0ff000277c5f8cd68d5d01000000
+                alias pejacevic
+        }
+        multipath {
+                wwid 3600c0ff00027786c94d68d5d01000000
+                alias pejacevic-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
@@ -159,11 +249,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
@@ -182,6 +303,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 +321,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
+       }
 }