Faidon has submitted this change and it was merged.
Change subject: nrpe: don't require/subscribe on the same resource
......................................................................
nrpe: don't require/subscribe on the same resource
Also, no point in requiring check_dpkg altogether. Well, no point in
requiring anything really, since there's a Class dependency, but maybe
this will go away later so let's leave it at that.
Change-Id: I01e02eba8853724790472ddcd7592cc27607873b
---
M manifests/nrpe.pp
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/nrpe.pp b/manifests/nrpe.pp
index de9373a..86d6c0e 100644
--- a/manifests/nrpe.pp
+++ b/manifests/nrpe.pp
@@ -126,12 +126,12 @@
class nrpe::service {
Class[nrpe::packages] -> Class[nrpe::service]
- service { nagios-nrpe-server:
- require => [ Package[nagios-nrpe-server],
File["/etc/nagios/nrpe_local.cfg"], File["/usr/lib/nagios/plugins/check_dpkg"]
],
- subscribe => File["/etc/nagios/nrpe_local.cfg"],
+ service { 'nagios-nrpe-server':
+ ensure => running,
pattern => "/usr/sbin/nrpe",
hasrestart => true,
restart => "killall nrpe; sleep 2;
/etc/init.d/nagios-nrpe-server start",
- ensure => running;
+ require => Package['nagios-nrpe-server'],
+ subscribe => File['/etc/nagios/nrpe_local.cfg'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/70418
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I01e02eba8853724790472ddcd7592cc27607873b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon <[email protected]>
Gerrit-Reviewer: Faidon <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
