[MediaWiki-commits] [Gerrit] operations/puppet[production]: maps::server: move base::firewall to role

2016-10-21 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: maps::server: move base::firewall to role
..


maps::server: move base::firewall to role

Move the "base::firewall" from node level to role,
because all nodes have it and should have it in the future
and it simplifies site.pp.

Change-Id: Iec2455ececf663d1f073d1e7640e8314f04abb28
---
M manifests/site.pp
M modules/role/manifests/maps/server.pp
2 files changed, 1 insertion(+), 6 deletions(-)

Approvals:
  Muehlenhoff: Looks good to me, but someone else must approve
  Dzahn: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/site.pp b/manifests/site.pp
index c336334..2ca056f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1905,32 +1905,26 @@
 
 node 'maps-test2001.codfw.wmnet' {
 role(maps::server, maps::master)
-include base::firewall
 }
 
 node /^maps-test200[2-4]\.codfw\.wmnet/ {
 role(maps::server, maps::slave)
-include base::firewall
 }
 
 node 'maps1001.eqiad.wmnet' {
 role(maps::server, maps::master)
-include base::firewall
 }
 
 node /^maps100[2-4]\.eqiad\.wmnet/ {
 role(maps::server, maps::slave)
-include base::firewall
 }
 
 node 'maps2001.codfw.wmnet' {
 role(maps::server, maps::master)
-include base::firewall
 }
 
 node /^maps200[2-4]\.codfw\.wmnet/ {
 role(maps::server, maps::slave)
-include base::firewall
 }
 
 node /^mc10(0[1-9]|1[0-8])\.eqiad\.wmnet/ {
diff --git a/modules/role/manifests/maps/server.pp 
b/modules/role/manifests/maps/server.pp
index 9ec1564..f08f34a 100644
--- a/modules/role/manifests/maps/server.pp
+++ b/modules/role/manifests/maps/server.pp
@@ -2,6 +2,7 @@
 # the services kartotherian and tilerator
 class role::maps::server {
 include standard
+include base::firewall
 include ::cassandra
 include ::cassandra::metrics
 include ::cassandra::logging

-- 
To view, visit https://gerrit.wikimedia.org/r/315889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec2455ececf663d1f073d1e7640e8314f04abb28
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: maps::server: move base::firewall to role

2016-10-13 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315889

Change subject: maps::server: move base::firewall to role
..

maps::server: move base::firewall to role

Move the "base::firewall" from node level to role,
because all nodes have it and should have it in the future
and it simplifies site.pp.

Change-Id: Iec2455ececf663d1f073d1e7640e8314f04abb28
---
M manifests/site.pp
M modules/role/manifests/maps/server.pp
2 files changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/89/315889/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 6b7f891..19c7758 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1923,32 +1923,26 @@
 
 node 'maps-test2001.codfw.wmnet' {
 role(maps::server, maps::master, prometheus::node_exporter)
-include base::firewall
 }
 
 node /^maps-test200[2-4]\.codfw\.wmnet/ {
 role(maps::server, maps::slave, prometheus::node_exporter)
-include base::firewall
 }
 
 node 'maps1001.eqiad.wmnet' {
 role(maps::server, maps::master)
-include base::firewall
 }
 
 node /^maps100[2-4]\.eqiad\.wmnet/ {
 role(maps::server, maps::slave)
-include base::firewall
 }
 
 node 'maps2001.codfw.wmnet' {
 role(maps::server, maps::master)
-include base::firewall
 }
 
 node /^maps200[2-4]\.codfw\.wmnet/ {
 role(maps::server, maps::slave)
-include base::firewall
 }
 
 node /^mc(10[01][0-9])\.eqiad\.wmnet/ {
diff --git a/modules/role/manifests/maps/server.pp 
b/modules/role/manifests/maps/server.pp
index 270d919..5fd4e62 100644
--- a/modules/role/manifests/maps/server.pp
+++ b/modules/role/manifests/maps/server.pp
@@ -2,6 +2,7 @@
 # the services kartotherian and tilerator
 class role::maps::server {
 include standard
+include base::firewall
 include ::cassandra
 include ::cassandra::metrics
 include ::cassandra::logging

-- 
To view, visit https://gerrit.wikimedia.org/r/315889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec2455ececf663d1f073d1e7640e8314f04abb28
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits