Dzahn has uploaded a new change for review.

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

Change subject: peopleweb: move base::firewall from node to role
......................................................................

peopleweb: move base::firewall from node to role

Move base::firewall into the role, like it is already the
case for all other microsite roles. Remove it from node level.

Change-Id: I064026ff64b73219b571be590f8a847b778a5d7a
---
M manifests/site.pp
M modules/role/manifests/microsites/peopleweb.pp
2 files changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/78/315878/1

diff --git a/manifests/site.pp b/manifests/site.pp
index ecf59b3..3dc70a8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2563,7 +2563,6 @@
 # people.wikimedia.org, for all shell users
 node 'rutherfordium.eqiad.wmnet' {
     role(microsites::peopleweb, backup::host)
-    include base::firewall
 }
 
 # ruthenium is a parsoid regression test server
diff --git a/modules/role/manifests/microsites/peopleweb.pp 
b/modules/role/manifests/microsites/peopleweb.pp
index a576db7..dd2b1d4 100644
--- a/modules/role/manifests/microsites/peopleweb.pp
+++ b/modules/role/manifests/microsites/peopleweb.pp
@@ -2,6 +2,7 @@
 class role::microsites::peopleweb {
 
     include standard
+    include base::firewall
 
     class { '::publichtml':
         sitename     => 'people.wikimedia.org',

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

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

Reply via email to