Define public IP addresses in base since we cannot trust facter

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

diff --git a/manifests/site.pp b/manifests/site.pp
index b0bd0f9..3e4e39d 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,43 +19,20 @@ Service {
 }
 
 node default {
+       # we really should rename this one
        include site
-       include munin
-       include syslog_ng
-       include sudo
-       include ssh
-       include debian_org
-       include monit
-       include time
-       include ssl
-       include hardware
-       include nagios::client
-       include resolv
-       include roles
-       include motd
-       include unbound
-       include bacula::client
-       include autofs
-       include dsa_lvm
-       include grub
-       include multipath
-       include popcon
-       include portforwarder
-       include postgres
-       include haveged
-       include huge_mem
-       include tcp_bbr
-
-       if $::lsbdistcodename == squeeze {
-               include roles::udldap::client
-       } else {
-               include roles::pubsub::client
-               class { 'roles::udldap::client':
-                       ensure => absent
-               }
+       include base
+
+       # this is magic: it will include whatever classes says we should
+       # include, based on the value of the "classes" array
+       hiera_include('classes')
+
+       include roles::pubsub::client
+       class { 'roles::udldap::client':
+               ensure => absent
        }
 
-       if $::hostname in [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
        }
 
@@ -80,10 +57,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
        }
@@ -105,6 +78,6 @@ node default {
        }
 
        if $::hostname == 'pkgmirror-csail' {
-               include varnish
+               include varnish_pkgmirror
        }
 }