* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
replace a few dijkstra occurrences with ubc-bl8
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
Conflicts:
modules/lvm/manifests/init.pp
class lvm {
case $::hostname {
- ubc-bm8,luchesi: {
+ ubc-bl8,luchesi: {
$conffile = 'lvm-ubc-ganeti.conf'
}
tristano,pasquini,bertali,boito: {
}
$ntpservers = $::hostname ? {
- default => ['czerny.debian.org', 'clementi.debian.org', 'bm-bl1.debian.org', 'bm-bl2.debian.org', 'dijkstra.debian.org', 'luchesi.debian.org']
+ default => ['czerny.debian.org', 'clementi.debian.org', 'bm-bl1.debian.org', 'bm-bl2.debian.org', 'ubc-bl8.debian.org', 'luchesi.debian.org']
}
file { '/etc/default/ntpdate':