[MediaWiki-commits] [Gerrit] Move the base::firewall include into the impala role - change (operations/puppet)

2015-10-26 Thread Muehlenhoff (Code Review) 
Muehlenhoff has submitted this change and it was merged.

Change subject: Move the base::firewall include into the impala role
..


Move the base::firewall include into the impala role

Change-Id: I829a22910f3d15530e4d3a91c4bea6d3290d741e
---
M manifests/role/analytics/impala.pp
M manifests/site.pp
2 files changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Muehlenhoff: Verified; Looks good to me, approved



diff --git a/manifests/role/analytics/impala.pp 
b/manifests/role/analytics/impala.pp
index d4a4ecf..3fef7ae 100644
--- a/manifests/role/analytics/impala.pp
+++ b/manifests/role/analytics/impala.pp
@@ -31,6 +31,7 @@
 #
 class role::analytics::impala::master {
 include role::analytics::impala
+include base::firewall
 
 # The llama-master package stupidly creates the llama user
 # with a non system uid.  This causes our admin module to
diff --git a/manifests/site.pp b/manifests/site.pp
index 26fd0ed..83f3167 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -150,7 +150,6 @@
 include role::analytics::clients
 include role::analytics::impala::master
 include role::logging::udp2log::misc
-include base::firewall
 }
 
 # analytics1027 hosts some frontend web interfaces to Hadoop

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I829a22910f3d15530e4d3a91c4bea6d3290d741e
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Move the base::firewall include into the impala role - change (operations/puppet)

2015-10-14 Thread Muehlenhoff (Code Review) 
Muehlenhoff has uploaded a new change for review.

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

Change subject: Move the base::firewall include into the impala role
..

Move the base::firewall include into the impala role

Change-Id: I829a22910f3d15530e4d3a91c4bea6d3290d741e
---
M manifests/role/analytics/impala.pp
M manifests/site.pp
2 files changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/246221/1

diff --git a/manifests/role/analytics/impala.pp 
b/manifests/role/analytics/impala.pp
index d4a4ecf..3fef7ae 100644
--- a/manifests/role/analytics/impala.pp
+++ b/manifests/role/analytics/impala.pp
@@ -31,6 +31,7 @@
 #
 class role::analytics::impala::master {
 include role::analytics::impala
+include base::firewall
 
 # The llama-master package stupidly creates the llama user
 # with a non system uid.  This causes our admin module to
diff --git a/manifests/site.pp b/manifests/site.pp
index 7d53873..b19f86b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -147,7 +147,6 @@
 include role::analytics::clients
 include role::analytics::impala::master
 include role::logging::udp2log::misc
-include base::firewall
 include base::debdeploy
 # lint:ignore:quoted_booleans
 # salt grain values are passed to a shell command

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

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

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