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

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

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


releases: Move the base::firewall include into the role

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

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/manifests/role/releases.pp b/manifests/role/releases.pp
index 391fa08..e1f1c26 100644
--- a/manifests/role/releases.pp
+++ b/manifests/role/releases.pp
@@ -1,5 +1,6 @@
 class role::releases {
 system::role { 'releases': description => 'Releases webserver' }
+include base::firewall
 
 monitoring::service { 'http':
 description   => 'HTTP',
diff --git a/manifests/site.pp b/manifests/site.pp
index 007db51..cd0e4b2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -297,7 +297,6 @@
 # http://releases.wikimedia.org
 node 'caesium.eqiad.wmnet' {
 role releases
-include base::firewall
 include standard
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e2cb756973d646d05cf92faa8eabef0ddf88ef7
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: John F. Lewis 
Gerrit-Reviewer: jenkins-bot <>

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

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

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

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

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

releases: Move the base::firewall include into the role

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/23/243123/1

diff --git a/manifests/role/releases.pp b/manifests/role/releases.pp
index 391fa08..e1f1c26 100644
--- a/manifests/role/releases.pp
+++ b/manifests/role/releases.pp
@@ -1,5 +1,6 @@
 class role::releases {
 system::role { 'releases': description => 'Releases webserver' }
+include base::firewall
 
 monitoring::service { 'http':
 description   => 'HTTP',
diff --git a/manifests/site.pp b/manifests/site.pp
index 229b0fd..a8298f2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -293,7 +293,6 @@
 # http://releases.wikimedia.org
 node 'caesium.eqiad.wmnet' {
 role releases
-include base::firewall
 include standard
 }
 

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

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