Load named::geodns from roles/manifests/init.pp based on hiera instead of from site...

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 6b8be82..b735738 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -47,13 +47,9 @@ node default {
        include tcp_bbr
        include certregen::client
 
-       if $::lsbdistcodename == squeeze {
-               include roles::udldap::client
-       } else {
-               include roles::pubsub::client
-               class { 'roles::udldap::client':
-                       ensure => absent
-               }
+       include roles::pubsub::client
+       class { 'roles::udldap::client':
+               ensure => absent
        }
 
        if getfromhash($site::nodeinfo, 'ganeti') {
@@ -81,10 +77,6 @@ node default {
                include apache2
        }
 
-       if $::hostname in [geo1,geo2,geo3] {
-               include named::geodns
-       }
-
        if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
                include nfs_server
        }