projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the pkglist fact. It's a) unused and b) slightly buggy
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
6ab0e97
..
dc1dee0
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-15,11
+15,6
@@
class roles {
include nagios::server
}
include nagios::server
}
- # XXX: turn this into a real role
- if getfromhash($site::nodeinfo, 'buildd') {
- include buildd
- }
-
if has_role('bugs_mirror') {
include roles::bugs_mirror
}
if has_role('bugs_mirror') {
include roles::bugs_mirror
}
@@
-121,10
+116,6
@@
class roles {
include roles::syncproxy
}
include roles::syncproxy
}
- if has_role('static_master') {
- include roles::static_master
- }
-
if has_role('static_mirror') {
include roles::static_mirror
} elsif has_role('static_source') {
if has_role('static_mirror') {
include roles::static_mirror
} elsif has_role('static_source') {
@@
-210,10
+201,6
@@
class roles {
include roles::rtc
}
include roles::rtc
}
- if has_role('jenkins') {
- include roles::jenkins
- }
-
if has_role('postgres_backup_server') {
include postgres::backup_server
}
if has_role('postgres_backup_server') {
include postgres::backup_server
}