Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

* '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

diff --git a/modules/lvm/manifests/init.pp b/modules/lvm/manifests/init.pp
index a91d5a2a6d67d2381623fc61048a420bd5651c09..94d0b2859a70ae924cfd9c2c822d64546b7ae6f1 100644 (file)
--- a/modules/lvm/manifests/init.pp
+++ b/modules/lvm/manifests/init.pp
@@ -1,6 +1,6 @@
 class lvm {
        case $::hostname {
-               ubc-bm8,luchesi: {
+               ubc-bl8,luchesi: {
                        $conffile = 'lvm-ubc-ganeti.conf'
                }
                tristano,pasquini,bertali,boito: {

diff --git a/modules/ntpdate/manifests/init.pp b/modules/ntpdate/manifests/init.pp
index c514aafdb17bef2dbe584c7c6e303ef3d9ab9bfe..de9c335c4ff0c29458c471c3583781cfe05e8820 100644 (file)
--- a/modules/ntpdate/manifests/init.pp
+++ b/modules/ntpdate/manifests/init.pp
@@ -9,7 +9,7 @@ class ntpdate {
                }
 
                $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':