X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Froles%2Fmanifests%2Finit.pp;h=487430a0d7b251deb2fb7c04130ee63c2ace4872;hb=47ef30bef77893865ca0d1a852d5a79b02d78eee;hp=2746d54e9de05254c3de3c797394e242b3aca0aa;hpb=0b1aa47605492af8ae051029c248d87e075f00b2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 2746d54e9..487430a0d 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -69,6 +69,10 @@ class roles {
 		include roles::www_mirror
 	}
 
+	if has_role('mirror_debug') {
+		include roles::debug_mirror
+	}
+
 	if has_role('ftp.d.o') {
 		include roles::ftp
 	}
@@ -77,6 +81,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
 	}
@@ -170,6 +178,10 @@ class roles {
 		include roles::sso
 	}
 
+	if has_role('sso_rp') {
+		include roles::sso_rp
+	}
+
 	if has_role('tracker') {
 		include roles::tracker
 	}
@@ -202,9 +214,20 @@ class roles {
 		include roles::rtc
 	}
 
+	if has_role('jenkins') {
+		include roles::jenkins
+	}
+
 	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 +263,29 @@ 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
+	}
+
+	if $::hostname in [lw01, lw02, lw03, lw04] {
+		include snapshot
+	}
+
+	if has_role('veyepar.debian.org') {
+		ssl::service { 'veyepar.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+
+	if has_role('httpredir') {
+		include roles::httpredir
+	}
+
+	if has_role('debtags') {
+		include roles::debtags
+	}
 }