Mark Bergsma has submitted this change and it was merged.
Change subject: Move the upstart job for a normal gmond to
ganglia::monitor::service
......................................................................
Move the upstart job for a normal gmond to ganglia::monitor::service
Change-Id: I8ec29e92a4b518c91b7df0dfa69ffdb18ac5ab31
---
M modules/ganglia/manifests/monitor/packages.pp
M modules/ganglia/manifests/monitor/service.pp
2 files changed, 8 insertions(+), 7 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ganglia/manifests/monitor/packages.pp
b/modules/ganglia/manifests/monitor/packages.pp
index d6aeac3..d66d6e3 100644
--- a/modules/ganglia/manifests/monitor/packages.pp
+++ b/modules/ganglia/manifests/monitor/packages.pp
@@ -2,11 +2,4 @@
if !defined(Package["ganglia-monitor"]) {
package { "ganglia-monitor": ensure => latest }
}
-
- file { "/etc/init/ganglia-monitor.conf":
- source =>
"puppet:///modules/ganglia/upstart/ganglia-monitor.conf",
- mode => 0444
- }
-
- upstart_job { "ganglia-monitor": }
}
diff --git a/modules/ganglia/manifests/monitor/service.pp
b/modules/ganglia/manifests/monitor/service.pp
index 6171fdf..168dfe3 100644
--- a/modules/ganglia/manifests/monitor/service.pp
+++ b/modules/ganglia/manifests/monitor/service.pp
@@ -1,7 +1,15 @@
class ganglia::monitor::service() {
Class[ganglia::monitor::config] -> Class[ganglia::monitor::service]
+ file { "/etc/init/ganglia-monitor.conf":
+ source =>
"puppet:///modules/ganglia/upstart/ganglia-monitor.conf",
+ mode => 0444
+ }
+
+ upstart_job { "ganglia-monitor": }
+
service { "ganglia-monitor":
+ require => File["/etc/init/ganglia-monitor.conf"],
ensure => running,
provider => upstart
}
--
To view, visit https://gerrit.wikimedia.org/r/53579
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8ec29e92a4b518c91b7df0dfa69ffdb18ac5ab31
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
