pubsub client config

[dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 8e4a77ac332759f66c66d6608d4892c68c1a3a1b..3d46f4ee0c6ea8ae0022611018750a7f455e377d 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -39,6 +39,7 @@ node default {
        include autofs
        include lvm
        include multipath
+       include roles::pubsub::client
 
        if $::hostname in [pasquini,tristano,bertali,boito,rossini,salieri,dijkstra,luchesi,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14] {
                include ganeti2
@@ -57,7 +58,7 @@ node default {
                }
        }
 
-       if $::hostname == 'beethoven' {
+       if $::hostname == 'backuphost' {
                include bacula::storage
        }
 
@@ -86,17 +87,15 @@ node default {
                include apache2
        }
 
-       if $::hostname in [ravel,senfl,orff,draghi,diamond,rietz] {
-               include named::authoritative
-       } elsif $::hostname in [geo1,geo2,geo3] {
+       if $::hostname in [geo1,geo2,geo3] {
                include named::geodns
        }
 
-       if $::hostname in [diabelli,nono,spohr] {
+       if $::hostname in [diabelli,nono] {
                include dacs
        }
 
-       if $::hostname in [beethoven,spohr,stabile,beach,glinka,milanollo] {
+       if $::hostname in [stabile,beach,glinka,milanollo,rautavaara] {
                include nfs-server
        }