Muehlenhoff has submitted this change and it was merged.
Change subject: videoscalers: move base::firewall include into the role
......................................................................
videoscalers: move base::firewall include into the role
Now that all video scalers use ferm, move the include of base::firewall
into the role.
Change-Id: I6344c8051a0fc3644bb2cef5673cb397bdd168f1
---
M manifests/role/mediawiki.pp
M manifests/site.pp
2 files changed, 1 insertion(+), 4 deletions(-)
Approvals:
Muehlenhoff: Verified; Looks good to me, approved
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index 21d2c2a..088d9f0 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -166,6 +166,7 @@
include ::role::mediawiki::common
include ::mediawiki::multimedia
include ::mediawiki::jobrunner
+ include base::firewall
}
class role::mediawiki::jobrunner {
diff --git a/manifests/site.pp b/manifests/site.pp
index 8081605..a2a08c6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1968,7 +1968,6 @@
# mw1152 is the experimental HAT videoscaler
node 'mw1152.eqiad.wmnet' {
role mediawiki::videoscaler
- include base::firewall
}
@@ -2011,7 +2010,6 @@
#mw1259-60 are videoscalers
node /^mw12(59|60)\.eqiad\.wmnet/ {
role mediawiki::videoscaler
- include base::firewall
}
# ROW A codfw appservers: mw2001-mw2079
@@ -2027,7 +2025,6 @@
#mw2007 is a videoscaler
node 'mw2007.codfw.wmnet' {
role mediawiki::videoscaler
- include base::firewall
}
#mw2008-mw2049 are appservers
@@ -2081,7 +2078,6 @@
#mw2152 is a videoscaler
node 'mw2152.codfw.wmnet' {
role mediawiki::videoscaler
- include base::firewall
}
#mw2153-mw2199 are appservers
--
To view, visit https://gerrit.wikimedia.org/r/242180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6344c8051a0fc3644bb2cef5673cb397bdd168f1
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
