projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configure rabbitmq for openstack
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
5ec93d1
..
a4ef596
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-30,13
+30,7
@@
class roles {
# XXX: turn this into a real role
if getfromhash($site::nodeinfo, 'porterbox') {
# XXX: turn this into a real role
if getfromhash($site::nodeinfo, 'porterbox') {
- class {'porterbox':
- ensure => present,
- }
- } else {
- class {'porterbox':
- ensure => absent,
- }
+ include porterbox
}
if has_role('bugs_mirror') {
}
if has_role('bugs_mirror') {
@@
-59,6
+53,12
@@
class roles {
include roles::dakmaster
}
include roles::dakmaster
}
+ if has_role('api.ftp-master') {
+ ssl::service { 'api.ftp-master.debian.org':
+ notify => Service['apache2'],
+ }
+ }
+
# XXX: turn this into a real role
if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
include roles::security_mirror
# XXX: turn this into a real role
if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
include roles::security_mirror
@@
-154,6
+154,10
@@
class roles {
include roles::lists
}
include roles::lists
}
+ if has_role('list_search') {
+ include roles::listsearch
+ }
+
if has_role('rtmaster') {
include roles::rtmaster
}
if has_role('rtmaster') {
include roles::rtmaster
}
@@
-201,6
+205,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
@@
-226,7
+237,14
@@
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']
,
}
}
}
}
+
+ if has_role('search_backend') {
+ include search_backend
+ }
+ if has_role('search_frontend') {
+ include search_frontend
+ }
}
}