Muehlenhoff has submitted this change and it was merged.
Change subject: Move base::firewall into the syslog role
......................................................................
Move base::firewall into the syslog role
Change-Id: I678cdd5ee59235c4b54d38782a301e1ece2d346a
---
M manifests/role/syslog.pp
M manifests/site.pp
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Muehlenhoff: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/syslog.pp b/manifests/role/syslog.pp
index e86cc77..42f99f5 100644
--- a/manifests/role/syslog.pp
+++ b/manifests/role/syslog.pp
@@ -4,6 +4,8 @@
#
class role::syslog::centralserver {
+ include base::firewall
+
system::role { 'role::syslog::centralserver':
description => 'Central syslog server'
}
diff --git a/manifests/site.pp b/manifests/site.pp
index c7dccfa..90aafb3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1381,11 +1381,9 @@
}
node 'lithium.eqiad.wmnet' {
-
include standard
include role::backup::host
include role::syslog::centralserver
- include base::firewall
}
node /^logstash100[1-3]\.eqiad\.wmnet$/ {
--
To view, visit https://gerrit.wikimedia.org/r/245959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I678cdd5ee59235c4b54d38782a301e1ece2d346a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
