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 fc283db..b735738 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -45,25 +45,20 @@ node default {
        include haveged
        include huge_mem
        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 $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,ubc-bl4,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,csail-node01,csail-node02,grnet-node01,grnet-node02,ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10,conova-node01,conova-node02] {
+       if getfromhash($site::nodeinfo, 'ganeti') {
                include ganeti2
        }
 
        if $::kernel == 'Linux' {
                include linux
                include acpi
-       } elsif $::kernel == 'GNU/kFreeBSD' {
-               include kfreebsd
        }
 
        if $::mta == 'exim4' {
@@ -82,11 +77,7 @@ node default {
                include apache2
        }
 
-       if $::hostname in [geo1,geo2,geo3] {
-               include named::geodns
-       }
-
-       if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov,sibelius] {
+       if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
                include nfs_server
        }
 
@@ -107,6 +98,6 @@ node default {
        }
 
        if $::hostname == 'pkgmirror-csail' {
-               include varnish
+               include varnish_pkgmirror
        }
 }