sigh, typo

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

diff --git a/manifests/site.pp b/manifests/site.pp
index ab6fd7dc66a8265d5a0c54883a4fd1e6a073161a..4dc9fc99c161bea83db65e0dcea125c7db77799b 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -39,12 +39,19 @@ node default {
        include autofs
        include lvm
        include multipath
+       if $::lsbdistcodename == squeeze {
+               include roles::udldap::client
+       } else {
+               include roles::pubsub::client
+               class { 'roles::udldap::client':
+                       ensure => absent
+               }
+       }
 
        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
        }
 
-
        if $::hostname == 'dinis' {
                include bacula::director
        } else {
@@ -86,14 +93,9 @@ node default {
                include apache2
        }
 
-       if $::hostname in [ravel,senfl,orff,diamond,rietz,denis] {
-               include named::authoritative
-       } elsif $::hostname in [geo1,geo2,geo3] {
+       if $::hostname in [geo1,geo2,geo3] {
                include named::geodns
        }
-       if $::hostname in [orff, denis] {
-               include dnsextras::entries
-       }
 
        if $::hostname in [diabelli,nono] {
                include dacs