[MediaWiki-commits] [Gerrit] operations/puppet[production]: mediawiki::appserver: move firewall from site to role

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397636 )

Change subject: mediawiki::appserver: move firewall from site to role
......................................................................

mediawiki::appserver: move firewall from site to role

Change-Id: I3ce1babecc3ab27bfd991c8ef5fbd9936e6d139e
---
M manifests/site.pp
M modules/role/manifests/mediawiki/appserver.pp
2 files changed, 1 insertion(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/397636/1

diff --git a/manifests/site.pp b/manifests/site.pp
index a06027c..8b2a68c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1092,7 +1092,6 @@
 node /labweb100[12]\.eqiad\.wmnet/ {
     role(mediawiki::appserver)
 
-    include ::base::firewall
     include ::ldap::role::client::labs
 
     interface::add_ip6_mapped { 'main': }
@@ -1615,7 +1614,6 @@
 # mw1180-1188 are apaches
 node /^mw118[0-8]\.eqiad\.wmnet$/ {
     role(mediawiki::appserver)
-    include ::base::firewall
 }
 
 # mw1189-1208 are api apaches
@@ -1626,7 +1624,6 @@
 # mw1209-1216, 1218-1220 are apaches
 node /^mw12(09|1[012345689]|20)\.eqiad\.wmnet$/ {
     role(mediawiki::appserver)
-    include ::base::firewall
 }
 
 #mw1221-mw1235 are api apaches
@@ -1637,7 +1634,6 @@
 #mw1238-mw1258 are apaches
 node /^mw12(3[8-9]|4[0-9]|5[0-8])\.eqiad\.wmnet$/ {
     role(mediawiki::appserver)
-    include ::base::firewall
 }
 
 #mw1259-60 are videoscalers
@@ -1654,7 +1650,6 @@
 
 node /^mw12(6[6-9]|7[0-5])\.eqiad\.wmnet$/ {
     role(mediawiki::appserver)
-    include ::base::firewall
 }
 
 # ROW A eqiad api appserver
@@ -1682,7 +1677,6 @@
 # ROW C eqiad appservers
 node /^mw13(19|2[0-8])\.eqiad\.wmnet$/ {
     role(mediawiki::appserver)
-    include ::base::firewall
 }
 
 # ROW B eqiad api-appservers
@@ -1752,7 +1746,6 @@
 #mw2163-mw2199 are appservers
 node /^mw21(6[3-9]|[6-9][0-9])\.codfw\.wmnet$/ {
     role(mediawiki::appserver)
-    include ::base::firewall
 }
 
 #mw2200-2214 are api appservers
@@ -1770,7 +1763,6 @@
 # mw2224-42 are appservers
 node /^mw22(2[4-9]|3[0-9]|4[0-2])\.codfw\.wmnet$/ {
     role(mediawiki::appserver)
-    include ::base::firewall
 }
 
 #mw2244-mw2245 are imagescalers
@@ -1797,7 +1789,6 @@
 #mw2254-2258 are appservers
 node /^mw225[4-8]\.codfw\.wmnet$/ {
     role(mediawiki::appserver)
-    include ::base::firewall
 }
 
 # mw logging host codfw
diff --git a/modules/role/manifests/mediawiki/appserver.pp 
b/modules/role/manifests/mediawiki/appserver.pp
index 8168c29..b027296 100644
--- a/modules/role/manifests/mediawiki/appserver.pp
+++ b/modules/role/manifests/mediawiki/appserver.pp
@@ -3,6 +3,7 @@
     system::role { 'mediawiki::appserver': }
 
     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/397636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ce1babecc3ab27bfd991c8ef5fbd9936e6d139e
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