[MediaWiki-commits] [Gerrit] operations/puppet[production]: RT: rm duplicate firewall, mv standard incl to role

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

Change subject: RT: rm duplicate firewall, mv standard incl to role
..


RT: rm duplicate firewall, mv standard incl to role

base::firewall is already in the role class, so that is duplicate

move the standard include into the role too, simplify site.pp

Change-Id: If13b04ad1d374d1d690f8f7208006d26f8402bfa
---
M manifests/site.pp
M modules/role/manifests/requesttracker/server.pp
2 files changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 6b7f891..ecf59b3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2823,9 +2823,6 @@
 node 'ununpentium.wikimedia.org' {
 role(requesttracker::server)
 
-include standard
-include base::firewall
-
 interface::add_ip6_mapped { 'main':
 interface => 'eth0',
 }
diff --git a/modules/role/manifests/requesttracker/server.pp 
b/modules/role/manifests/requesttracker/server.pp
index a07d05f..41e007a 100644
--- a/modules/role/manifests/requesttracker/server.pp
+++ b/modules/role/manifests/requesttracker/server.pp
@@ -3,6 +3,7 @@
 system::role { 'requesttracker::server': description => 'RT server' }
 
 include passwords::misc::rt
+include standard
 include base::firewall
 
 class { '::requesttracker':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If13b04ad1d374d1d690f8f7208006d26f8402bfa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
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]: RT: rm duplicate firewall, mv standard incl to role

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

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

Change subject: RT: rm duplicate firewall, mv standard incl to role
..

RT: rm duplicate firewall, mv standard incl to role

base::firewall is already in the role class, so that is duplicate

move the standard include into the role too, simplify site.pp

Change-Id: If13b04ad1d374d1d690f8f7208006d26f8402bfa
---
M manifests/site.pp
M modules/role/manifests/requesttracker/server.pp
2 files changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/315877/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 6b7f891..ecf59b3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2823,9 +2823,6 @@
 node 'ununpentium.wikimedia.org' {
 role(requesttracker::server)
 
-include standard
-include base::firewall
-
 interface::add_ip6_mapped { 'main':
 interface => 'eth0',
 }
diff --git a/modules/role/manifests/requesttracker/server.pp 
b/modules/role/manifests/requesttracker/server.pp
index a07d05f..41e007a 100644
--- a/modules/role/manifests/requesttracker/server.pp
+++ b/modules/role/manifests/requesttracker/server.pp
@@ -3,6 +3,7 @@
 system::role { 'requesttracker::server': description => 'RT server' }
 
 include passwords::misc::rt
+include standard
 include base::firewall
 
 class { '::requesttracker':

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

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