Muehlenhoff has submitted this change and it was merged.
Change subject: imagescalers: move base::firewall include into the role
......................................................................
imagescalers: move base::firewall include into the role
All image scalers use ferm now, so move the base::firewall include into
the role.
Change-Id: Ie4545513fa70d7bfab2ed88d3e71bbc9736365b9
---
M manifests/role/mediawiki.pp
M manifests/site.pp
2 files changed, 1 insertion(+), 3 deletions(-)
Approvals:
Muehlenhoff: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index 088d9f0..8a0b065 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -149,6 +149,7 @@
include ::mediawiki::multimedia
include ::role::mediawiki::webserver
+ include base::firewall
}
class role::mediawiki::videoscaler {
diff --git a/manifests/site.pp b/manifests/site.pp
index a2a08c6..9d17ab5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1974,7 +1974,6 @@
# mw1153-1160 are imagescalers (trusty)
node /^mw11(5[3-9]|60)\.eqiad\.wmnet$/ {
role mediawiki::imagescaler
- include base::firewall
}
# mw1161-1188 are apaches
@@ -2052,7 +2051,6 @@
#mw2086-mw2089 are imagescalers
node /^mw208[6-9]\.codfw\.wmnet$/ {
role mediawiki::imagescaler
- include base::firewall
}
#mw2090-mw2119 are appservers
@@ -2072,7 +2070,6 @@
#mw2148-mw2151 are imagescalers
node /^mw21(4[89]|5[01])\.codfw\.wmnet$/ {
role mediawiki::imagescaler
- include base::firewall
}
#mw2152 is a videoscaler
--
To view, visit https://gerrit.wikimedia.org/r/243122
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4545513fa70d7bfab2ed88d3e71bbc9736365b9
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[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
