[MediaWiki-commits] [Gerrit] operations/puppet[production]: udp2log: Replace undefined variable with $ensure_monitor_pro...

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

Change subject: udp2log: Replace undefined variable with 
$ensure_monitor_processes
..


udp2log: Replace undefined variable with $ensure_monitor_processes

Replaces $ensure_monitor_processes with $monitor_processes

Fix is suggested by scfc in T152104

Using this $ensure_monitor_processes variable is undefined, if you look at
the top of the file i changed you notice that the variable is not called
$ensure_monitor_processes but is called $monitor_processes. This patches fixes
this so it uses the correct variable $monitor_processes.

Follows-Up: 90fc2e11b3618545523d022d54df022d50bd3858

Bug: T152104
Change-Id: I59c591767361d048749ba424ef0e0abd1db4f9a5
---
M modules/udp2log/manifests/instance/monitoring.pp
1 file changed, 1 insertion(+), 4 deletions(-)

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



diff --git a/modules/udp2log/manifests/instance/monitoring.pp 
b/modules/udp2log/manifests/instance/monitoring.pp
index 4839300..e8a0216 100644
--- a/modules/udp2log/manifests/instance/monitoring.pp
+++ b/modules/udp2log/manifests/instance/monitoring.pp
@@ -37,10 +37,7 @@
 
 # Monitor that each filter process defined in
 # /etc/udp2log/$name is running
-# FIXME - top-scope var without namespace, will break in puppet 2.8
-# lint:ignore:variable_scope
-if ($ensure_monitor_processes == true and $ensure == 'running') {
-# lint:endignore
+if ($monitor_processes == true and $ensure == 'running') {
 nrpe::monitor_service { "udp2log_procs-${name}":
 ensure=> 'present',
 description   => "udp2log processes for ${name}",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I59c591767361d048749ba424ef0e0abd1db4f9a5
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: Tim Landscheidt 
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]: udp2log: Replace undefined variable with $ensure_monitor_pro...

2016-12-01 Thread Paladox (Code Review)
Paladox has uploaded a new change for review.

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

Change subject: udp2log: Replace undefined variable with 
$ensure_monitor_processes
..

udp2log: Replace undefined variable with $ensure_monitor_processes

Replaces $ensure_monitor_processes with $monitor_processes

Fix is suggested by scfc in T152104

Follows-Up: 90fc2e11b3618545523d022d54df022d50bd3858

Bug: T152104
Change-Id: I59c591767361d048749ba424ef0e0abd1db4f9a5
---
M modules/udp2log/manifests/instance/monitoring.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/41/324741/1

diff --git a/modules/udp2log/manifests/instance/monitoring.pp 
b/modules/udp2log/manifests/instance/monitoring.pp
index 4839300..4c41a47 100644
--- a/modules/udp2log/manifests/instance/monitoring.pp
+++ b/modules/udp2log/manifests/instance/monitoring.pp
@@ -39,7 +39,7 @@
 # /etc/udp2log/$name is running
 # FIXME - top-scope var without namespace, will break in puppet 2.8
 # lint:ignore:variable_scope
-if ($ensure_monitor_processes == true and $ensure == 'running') {
+if ($monitor_processes == true and $ensure == 'running') {
 # lint:endignore
 nrpe::monitor_service { "udp2log_procs-${name}":
 ensure=> 'present',

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

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

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