ferm: change ferm.conf to a template

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 2746d54e9de05254c3de3c797394e242b3aca0aa..4c8668471154fb97fd8e8ba1bdc838da9945a5ee 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -77,6 +77,10 @@ class roles {
                include roles::ftp_upload
        }
 
+       if has_role('ssh.upload.d.o') {
+               include roles::ssh_upload
+       }
+
        if has_role('git_master') {
                include roles::git_master
        }
@@ -205,6 +209,13 @@ class roles {
        if has_role('keystone') {
                include roles::keystone
        }
+       if has_role('keystone_rabbitmq') {
+               include roles::keystone::rabbitmq
+       }
+
+       if has_role('memcached') {
+               include roles::memcached
+       }
 
        if has_role('postgres_backup_server') {
                include postgres::backup_server
@@ -240,4 +251,11 @@ class roles {
        if has_role('search_frontend') {
                include search_frontend
        }
+
+       if has_role('dgit_browse') {
+               include dgit_browse
+       }
+       if has_role('dgit_git') {
+               include dgit_git
+       }
 }