Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/397701 )
Change subject: mwlog: style fixes, move firewall include
......................................................................
mwlog: style fixes, move firewall include
- use profile::base::firewall not base::firewall
- move firewall includes out of site / node level into role
(it's already there so duplicate)
- same for the ::standard include
Change-Id: I9795c0b6ef3ac88b27e622e9047943e19be8f9b8
---
M manifests/site.pp
M modules/role/manifests/logging/mediawiki/udp2log.pp
2 files changed, 2 insertions(+), 7 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 0763a89..724e999 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1771,17 +1771,11 @@
# mw logging host codfw
node 'mwlog2001.codfw.wmnet' {
role(xenon, logging::mediawiki::udp2log)
-
- include ::base::firewall
- include ::standard
}
# mw logging host eqiad
node 'mwlog1001.eqiad.wmnet' {
role(xenon, logging::mediawiki::udp2log)
-
- include ::base::firewall
- include ::standard
}
node 'mx1001.wikimedia.org' {
diff --git a/modules/role/manifests/logging/mediawiki/udp2log.pp
b/modules/role/manifests/logging/mediawiki/udp2log.pp
index 9724f96..a95fb2f 100644
--- a/modules/role/manifests/logging/mediawiki/udp2log.pp
+++ b/modules/role/manifests/logging/mediawiki/udp2log.pp
@@ -14,7 +14,8 @@
description => 'MediaWiki log collector',
}
- include ::base::firewall
+ include ::standard
+ include ::profile::base::firewall
# Rsync archived slow-parse logs to dumps.wikimedia.org.
# These are available for download at
http://dumps.wikimedia.org/other/slow-parse/
--
To view, visit https://gerrit.wikimedia.org/r/397701
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9795c0b6ef3ac88b27e622e9047943e19be8f9b8
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
