udd -> hiera role; explicitly include apache2

[mirror/dsa-puppet.git] / modules / roles / manifests / init.pp

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 01065f0..fefab3f 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -65,10 +65,6 @@ class roles {
                include roles::rtmaster
        }
 
-       if has_role('udd') {
-               include roles::udd
-       }
-
        if has_role('postgres_backup_server') {
                include postgres::backup_server
        }
@@ -86,10 +82,6 @@ class roles {
                include roles::snapshot_web
        }
 
-       if has_role('snapshot_shell') {
-               include roles::snapshot_shell
-       }
-
        if has_role('ports_master') {
                include roles::ports_master
        }