Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399543 )
Change subject: mediawiki::jobrunner: move firewall includes to role
......................................................................
mediawiki::jobrunner: move firewall includes to role
Change-Id: I39392adbe87f5de5492bd445c9e14035b4c02110
---
M manifests/site.pp
M modules/role/manifests/mediawiki/jobrunner.pp
2 files changed, 2 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/43/399543/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 96a2af1..8bb4c47 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1570,13 +1570,11 @@
# ROW A eqiad jobrunners
node /^mw1(299|30[0-6])\.eqiad\.wmnet$/ {
role(mediawiki::jobrunner)
- include ::base::firewall
}
# ROW C eqiad jobrunners
node /^mw133[4-7]\.eqiad\.wmnet$/ {
role(mediawiki::jobrunner)
- include ::base::firewall
}
@@ -1594,7 +1592,6 @@
# ROW A eqiad jobrunners
node /^mw13(0[89]|1[01])\.eqiad\.wmnet$/ {
role(mediawiki::jobrunner)
- include ::base::firewall
}
# ROW A videoscaler
@@ -1647,7 +1644,6 @@
#mw2153-62 are jobrunners
node /^mw21(5[3-9]|6[0-2])\.codfw\.wmnet$/ {
role(mediawiki::jobrunner)
- include ::base::firewall
}
#mw2163-mw2199 are appservers
@@ -1685,7 +1681,6 @@
# mw2247-2250 are jobrunners
node /^mw22(4[3789]|50)\.codfw\.wmnet$/ {
role(mediawiki::jobrunner)
- include ::base::firewall
}
#mw2251-2253 are api-appservers
diff --git a/modules/role/manifests/mediawiki/jobrunner.pp
b/modules/role/manifests/mediawiki/jobrunner.pp
index 81abbcc..5e0a434 100644
--- a/modules/role/manifests/mediawiki/jobrunner.pp
+++ b/modules/role/manifests/mediawiki/jobrunner.pp
@@ -2,6 +2,8 @@
class role::mediawiki::jobrunner {
system::role { 'mediawiki::jobrunner': }
+ include ::profile::base::firewall
+
# Parent role (we don't use inheritance by choice)
include ::role::mediawiki::common
--
To view, visit https://gerrit.wikimedia.org/r/399543
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I39392adbe87f5de5492bd445c9e14035b4c02110
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
