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=ec7b178cc84d7953e90695c7e3475ee98a0e9778;hpb=687b8ce55f6cd69d8ef14dc169114949c090a361;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 ec7b178cc..c1e18effa 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,44 +33,98 @@ multipaths {
                 wwid 3600c0ff000277c5fa859e15701000000
                 alias danzi-srv
         }
+        # debussy
+        multipath {
+                wwid 3600c0ff00027786c1541ce5901000000
+                alias debussy
+        }
         # diabelli
         multipath {
                 wwid 3600c0ff00027786cba48e05701000000
                 alias diabelli
         }
+        # donizetti
+        multipath {
+                wwid 3600c0ff00027786cf4a0875d01000000
+                alias donizetti
+        }
+        multipath {
+                wwid 3600c0ff00027786cfea0875d01000000
+                alias donizetti-lvm
+        }
         # elgar
         multipath {
                 wwid 3600c0ff00027786c2ed8de5701000000
                 alias elgar
         }
-        # fano
-        multipath {
-                wwid 3600c0ff00027786c54b7de5701000000
-                alias fano
-        }
+        # geo2
         multipath {
-                wwid 3600c0ff00027786c80b7de5701000000
-                alias fano-srv
+                wwid 3600c0ff00027786cbf5ee25701000000
+                alias geo2
         }
-        # finzi
+        # godard
         multipath {
-                wwid 3600c0ff00027786cbe4cdd5701000000
-                alias finzi
+                wwid 3600c0ff000277c5f1305945901000000
+                alias godard
         }
         multipath {
-                wwid 3600c0ff00027786c874edd5701000000
-                alias finzi-srv
+                wwid 3600c0ff00027786ca04e035d01000000
+                alias godard-lvm-hdd
         }
-        # geo2
         multipath {
-                wwid 3600c0ff00027786cbf5ee25701000000
-                alias geo2
+                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
+                alias gretchaninov
+        }
+        multipath {
+                wwid 3600c0ff00027786cefaae35701000000
+                alias gretchaninov-srv
+        }
+        # hier
+        multipath {
+                wwid 3600c0ff00027786c588a135901000000
+                alias hier
+        }
+        multipath {
+                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
@@ -71,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
@@ -94,6 +166,29 @@ 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
+                alias piu-slave-ubc-01
+        }
+        multipath {
+                wwid 3600c0ff00027786ce59cb15801000000
+                alias piu-slave-ubc-01-swap
+        }
         # rachmaninoff
         multipath {
                 wwid 3600c0ff000277c5f4505d15701000000
@@ -109,11 +204,69 @@ 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
+                alias tye
+        }
+        multipath {
+                wwid 3600c0ff00027786c39cfe35701000000
+                alias tye-srv
+                }
+        # ullmann
+        multipath {
+                wwid 3600c0ff00027786c21cfe35701000000
+                alias ullmann
+        }
+        multipath {
+                wwid 3600c0ff000277c5f25cfe35701000000
+                alias ullmann-lvm
+        }
+        # wuiet
+        multipath {
+                wwid 3600c0ff00027786c6b867a5d01000000
+                alias wuiet
+        }
+        multipath {
+                wwid 3600c0ff00027786c9b867a5d01000000
+                alias wuiet-lvm
+        }
         # x86-ubc-01
         multipath {
                 wwid 3600c0ff00027786cdc06dd5701000000
@@ -123,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
+       }
 }