X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=a65e7a9f4c80735ac5510afb04fdcfb84954a147;hb=64c1545f242396ff122e1af0ce35cf952a01c58c;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..a65e7a9f4 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -7,10 +7,6 @@
 #   include roles
 #
 class roles {
-	if has_role('nagiosmaster') {
-		include nagios::server
-	}
-
 	if has_role('security_mirror') {
 		include roles::security_mirror
 	}
@@ -19,10 +15,6 @@ class roles {
 		include postgres::backup_server
 	}
 
-	if $::hostname in [lw01, lw02, lw03, lw04, lw09, lw10] {
-		include roles::snapshot
-	}
-
 	if has_role('postgresql_server') {
 		include postgres::backup_source
 	}