projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sudo: repkace press by publicity
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
213f336
..
c0b46e2
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-77,6
+77,10
@@
class roles {
include roles::ftp_upload
}
include roles::ftp_upload
}
+ if has_role('ssh.upload.d.o') {
+ include roles::ssh_upload
+ }
+
if has_role('git_master') {
include roles::git_master
}
if has_role('git_master') {
include roles::git_master
}
@@
-154,9
+158,9
@@
class roles {
include roles::lists
}
include roles::lists
}
-
#
if has_role('list_search') {
-
#
include roles::listsearch
-
#
}
+ if has_role('list_search') {
+
include roles::listsearch
+ }
if has_role('rtmaster') {
include roles::rtmaster
if has_role('rtmaster') {
include roles::rtmaster
@@
-170,6
+174,10
@@
class roles {
include roles::sso
}
include roles::sso
}
+ if has_role('sso_rp') {
+ include roles::sso_rp
+ }
+
if has_role('tracker') {
include roles::tracker
}
if has_role('tracker') {
include roles::tracker
}
@@
-205,6
+213,13
@@
class roles {
if has_role('keystone') {
include roles::keystone
}
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
if has_role('postgres_backup_server') {
include postgres::backup_server
@@
-230,7
+245,7
@@
class roles {
if has_role('gobby_debian_org') {
ssl::service { 'gobby.debian.org':
if has_role('gobby_debian_org') {
ssl::service { 'gobby.debian.org':
-
tlsaport => 0
,
+
notify => Service['apache2']
,
}
}
}
}
@@
-240,4
+255,15
@@
class roles {
if has_role('search_frontend') {
include search_frontend
}
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
+ }
}
}