projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enable shipping www.debian.org logs to www-master.debian.org [RT#5872]
[mirror/dsa-puppet.git]
/
modules
/
multipath
/
templates
/
multipath-ubc-ganeti.conf.erb
diff --git
a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
index
016d349
..
3ff1199
100644
(file)
--- a/
modules/multipath/templates/multipath-ubc-ganeti.conf.erb
+++ b/
modules/multipath/templates/multipath-ubc-ganeti.conf.erb
@@
-25,8
+25,8
@@
blacklist {
devnode "^hd[a-z][[0-9]*]"
devnode "^vd[a-z]"
devnode "^cciss!c[0-9]d[0-9]*[p[0-9]*]"
devnode "^hd[a-z][[0-9]*]"
devnode "^vd[a-z]"
devnode "^cciss!c[0-9]d[0-9]*[p[0-9]*]"
-<%- if %w{
pasquini tristano boito bertali
}.include?(hostname) then -%>
- devnode "^sda[0-9]*"
+<%- if %w{
ubc-bl7 ubc-bl3 ubc-bl6 ubc-bl2
}.include?(hostname) then -%>
+ devnode "^sda[0-9]*
$
"
<%- end -%>
device {
vendor DEC.*
<%- end -%>
device {
vendor DEC.*
@@
-52,15
+52,6
@@
multipaths {
wwid 3600c0ff000d5f6bd3ed7995101000000
alias r10-geo2
}
wwid 3600c0ff000d5f6bd3ed7995101000000
alias r10-geo2
}
- # brahms
- multipath {
- wwid 3600c0ff000d5f6bdf4fa995101000000
- alias r10-brahms
- }
- multipath {
- wwid 3600c0ff000d5f6bdfdfa995101000000
- alias r10-brahms-srv
- }
# lotti
multipath {
wwid 3600c0ff000d5f6bd9a2a9a5101000000
# lotti
multipath {
wwid 3600c0ff000d5f6bd9a2a9a5101000000
@@
-70,33
+61,15
@@
multipaths {
wwid 3600c0ff000d5f6bd1ab08c4c01000000
alias r6-lotti-srv
}
wwid 3600c0ff000d5f6bd1ab08c4c01000000
alias r6-lotti-srv
}
- # lilburn
- multipath {
- wwid 3600c0ff000d5f6bd40329a5101000000
- alias r10-lilburn
- }
- multipath {
- wwid 3600c0ff000d5f6bd46329a5101000000
- alias r10-lilburn-srv
- }
# elgar
multipath {
wwid 3600c0ff000d5f6bd04849b5101000000
alias r10-elgar
}
# elgar
multipath {
wwid 3600c0ff000d5f6bd04849b5101000000
alias r10-elgar
}
- # jenk
ins
+ # jenk
o
multipath {
wwid 3600c0ff000d5f6bdf38f9b5101000000
multipath {
wwid 3600c0ff000d5f6bdf38f9b5101000000
- alias r10-jenkins
- }
- # popov
- multipath {
- wwid 3600c0ff000d5f6bda9a19b5101000000
- alias r10-popov
- }
- multipath {
- wwid 3600c0ff000d5f6bdaaa19b5101000000
- alias r10-popov-srv
+ alias r10-jenko
}
# fano
multipath {
}
# fano
multipath {
@@
-126,11
+99,6
@@
multipaths {
wwid 3600c0ff000d5f6bd318a9e5101000000
alias r10-gombert
}
wwid 3600c0ff000d5f6bd318a9e5101000000
alias r10-gombert
}
- # blavet
- multipath {
- wwid 3600c0ff000d5f6bd736aa05101000000
- alias r10-blavet
- }
# tye
multipath {
wwid 3600c0ff000d5f6bdb08aa05101000000
# tye
multipath {
wwid 3600c0ff000d5f6bdb08aa05101000000
@@
-163,4
+131,17
@@
multipaths {
wwid 3600c0ff000d5f6bd0944b85101000000
alias r10-nono
}
wwid 3600c0ff000d5f6bd0944b85101000000
alias r10-nono
}
+ multipath {
+ wwid 3600c0ff000d5f6bd6c75695501000000
+ alias r10-nono-lvm
+ }
+ # bizet
+ multipath {
+ wwid 3600c0ff000d5f6bdba31435501000000
+ alias r10-bizet
+ }
+ multipath {
+ wwid 3600c0ff000d5f6bdc5d83f4f01000000
+ alias bizet-srv
+ }
}
}