X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=c1cdd53db0ba602be91fd83acb2816af2f72fd7e;hb=6ecc5aff091790a2d65d2f911215032d76e3a43d;hp=f4494e6b00d55236dac01c9d3500dd6bb1b3d1c0;hpb=05585e883e1de8150cc30ac1d2e474c0b153c128;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index f4494e6b0..c1cdd53db 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,43 +19,16 @@ Service {
 }
 
 node default {
-	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
+	# this is magic: it will include whatever classes says we should
+	# include, based on the value of the "classes" array
+	hiera_include('classes')
 
-	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 [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 +53,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
 	}