Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391731 )
Change subject: mediawiki:appserver:api: move firewall to role, use profile
......................................................................
mediawiki:appserver:api: move firewall to role, use profile
Change-Id: I1d53e587dbdfe0594ff1b9e71fbdc7c18c0b1c7e
---
M manifests/site.pp
M modules/role/manifests/mediawiki/appserver/api.pp
2 files changed, 1 insertion(+), 9 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 189a16e..a06027c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1621,7 +1621,6 @@
# mw1189-1208 are api apaches
node /^mw1(189|19[0-9]|20[0-8])\.eqiad\.wmnet$/ {
role(mediawiki::appserver::api)
- include ::base::firewall
}
# mw1209-1216, 1218-1220 are apaches
@@ -1633,7 +1632,6 @@
#mw1221-mw1235 are api apaches
node /^mw12(2[1-9]|3[0-5])\.eqiad\.wmnet$/ {
role(mediawiki::appserver::api)
- include ::base::firewall
}
#mw1238-mw1258 are apaches
@@ -1663,12 +1661,10 @@
# mw1276 - mw1290
node /^mw127[6-9]\.eqiad\.wmnet$/ {
role(mediawiki::appserver::canary_api)
- include ::base::firewall
}
node /^mw12(8[0-9]|90)\.eqiad\.wmnet$/ {
role(mediawiki::appserver::api)
- include ::base::firewall
}
# ROW A eqiad imagescalers
@@ -1692,7 +1688,6 @@
# ROW B eqiad api-appservers
node /^mw13(1[2-7])\.eqiad\.wmnet$/ {
role(mediawiki::appserver::api)
- include ::base::firewall
}
# ROW A eqiad jobrunners
@@ -1728,7 +1723,6 @@
#mw2120-2147 are api appservers
node /^mw21([2-3][0-9]|4[0-7])\.codfw\.wmnet$/ {
role(mediawiki::appserver::api)
- include ::base::firewall
}
# ROW B codfw appservers
@@ -1764,7 +1758,6 @@
#mw2200-2214 are api appservers
node /^mw22(0[0-9]|1[0-4])\.codfw\.wmnet$/ {
role(mediawiki::appserver::api)
- include ::base::firewall
}
# New Appservers, in row A3/A4
@@ -1772,7 +1765,6 @@
#mw2215-2223 are api appservers
node /^mw22(1[5-9]|2[0123])\.codfw\.wmnet$/ {
role(mediawiki::appserver::api)
- include ::base::firewall
}
# mw2224-42 are appservers
@@ -1800,7 +1792,6 @@
#mw2251-2253 are api-appservers
node /^mw225[1-3]\.codfw\.wmnet$/ {
role(mediawiki::appserver::api)
- include ::base::firewall
}
#mw2254-2258 are appservers
diff --git a/modules/role/manifests/mediawiki/appserver/api.pp
b/modules/role/manifests/mediawiki/appserver/api.pp
index 445e980..83494bb 100644
--- a/modules/role/manifests/mediawiki/appserver/api.pp
+++ b/modules/role/manifests/mediawiki/appserver/api.pp
@@ -2,6 +2,7 @@
system::role { 'mediawiki::appserver::api': }
include ::role::mediawiki::webserver
+ include ::profile::base::firewall
include ::profile::prometheus::apache_exporter
include ::profile::prometheus::hhvm_exporter
--
To view, visit https://gerrit.wikimedia.org/r/391731
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1d53e587dbdfe0594ff1b9e71fbdc7c18c0b1c7e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
