Muehlenhoff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/242180
Change subject: Move base::firewall include into the role
......................................................................
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(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/80/242180/1
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index b24f35d..d9ca5dc 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -167,6 +167,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 f027cd6..2724bd0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1954,7 +1954,6 @@
# mw1152 is the experimental HAT videoscaler
node 'mw1152.eqiad.wmnet' {
role mediawiki::videoscaler
- include base::firewall
}
@@ -1997,7 +1996,6 @@
#mw1259-60 are videoscalers
node /^mw12(59|60)\.eqiad\.wmnet/ {
role mediawiki::videoscaler
- include base::firewall
}
# ROW A codfw appservers: mw2001-mw2079
@@ -2013,7 +2011,6 @@
#mw2007 is a videoscaler
node 'mw2007.codfw.wmnet' {
role mediawiki::videoscaler
- include base::firewall
}
#mw2008-mw2049 are appservers
@@ -2067,7 +2064,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: newchange
Gerrit-Change-Id: I6344c8051a0fc3644bb2cef5673cb397bdd168f1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
