X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Finit.pp;h=9e5e649eb5a7db848ba65682e5c0f0f921421713;hb=f637b06b86d3158d08102a000722ce2ddb54fd23;hp=6accbf7417a3f844360219d0d84dfc3c83607044;hpb=9f90645c16ed191842f982c489c01e9c9e6f6d96;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 6accbf741..9e5e649eb 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -1,33 +1,15 @@
 # = Class: roles
 #
-# Lookup role and include relevant classes for roles
-#
-# == Sample Usage:
-#
-#   include roles
-#
 class roles {
-	if has_role('nagiosmaster') {
-		include nagios::server
-	}
-
-	if has_role('security_mirror') {
-		include roles::security_mirror
-	}
-
-	if has_role('postgres_backup_server') {
-		include postgres::backup_server
-	}
-
-	if $::hostname in [lw01, lw02, lw03, lw04, lw09, lw10] {
-		include roles::snapshot
-	}
+  if has_role('postgres_backup_server') {
+    include postgres::backup_server
+  }
 
-	if has_role('postgresql_server') {
-		include postgres::backup_source
-	}
+  if has_role('postgresql_server') {
+    include postgres::backup_source
+  }
 
-	if $::keyring_debian_org_mirror {
-		include roles::keyring_debian_org_mirror
-	}
+  if $::keyring_debian_org_mirror {
+    include roles::keyring_debian_org_mirror
+  }
 }