Include hiera classes

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 9bf2eb8..88f565d 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,7 +19,10 @@ Service {
 }
 
 node default {
-       include site
+       # this is magic: it will include whatever classes says we should
+       # include, based on the value of the "classes" array
+       hiera_include('classes')
+
        include munin
        include syslog_ng
        include sudo
@@ -45,14 +48,11 @@ 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 getfromhash($site::nodeinfo, 'ganeti') {
@@ -80,10 +80,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
        }