Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/392768 )
Change subject: mw_canary_appserver: mv firewall incl to role, use profile
......................................................................
mw_canary_appserver: mv firewall incl to role, use profile
Change-Id: Iaf2c7273fe9990eddc639a533214c90dfc6d9e1e
---
M manifests/site.pp
M modules/role/manifests/mediawiki/canary_appserver.pp
2 files changed, 1 insertion(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/68/392768/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 1a8ebb3..f0116e2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1633,7 +1633,6 @@
# They replace mw1017 and mw1099
node /^mwdebug100[12]\.eqiad\.wmnet$/ {
role(mediawiki::canary_appserver)
- include ::base::firewall
}
# mw1180-1188 are apaches
@@ -1676,7 +1675,6 @@
node /^mw126[1-5]\.eqiad\.wmnet$/ {
role(mediawiki::canary_appserver)
- include ::base::firewall
}
node /^mw12(6[6-9]|7[0-5])\.eqiad\.wmnet$/ {
@@ -1742,7 +1740,6 @@
# mw2017/mw2099 are codfw test appservers
node /^mw20(17|99)\.codfw\.wmnet$/ {
role(mediawiki::canary_appserver)
- include ::base::firewall
}
#mw2097, mw2100-mw2117 are appservers
diff --git a/modules/role/manifests/mediawiki/canary_appserver.pp
b/modules/role/manifests/mediawiki/canary_appserver.pp
index 47c2c2a..10b3327 100644
--- a/modules/role/manifests/mediawiki/canary_appserver.pp
+++ b/modules/role/manifests/mediawiki/canary_appserver.pp
@@ -1,7 +1,7 @@
# Class for a subgroup of appservers where we can test experimental features
class role::mediawiki::canary_appserver {
include role::mediawiki::appserver
-
+ include ::profile::base::firewall
# include the deployment scripts because mwscript can occasionally be
useful
# here: T112174
include scap::scripts
--
To view, visit https://gerrit.wikimedia.org/r/392768
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf2c7273fe9990eddc639a533214c90dfc6d9e1e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
