Mark Bergsma has submitted this change and it was merged.
Change subject: Fix dependencies
......................................................................
Fix dependencies
Change-Id: Ief8342b7779fc1639f11120377b455fc205ba9e3
---
M modules/ganglia/manifests/monitor/aggregator/init.pp
M modules/ganglia/manifests/monitor/aggregator/instance.pp
2 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ganglia/manifests/monitor/aggregator/init.pp
b/modules/ganglia/manifests/monitor/aggregator/init.pp
index 47e023c..3231fb0 100644
--- a/modules/ganglia/manifests/monitor/aggregator/init.pp
+++ b/modules/ganglia/manifests/monitor/aggregator/init.pp
@@ -9,9 +9,11 @@
mode => 0555;
"/etc/init/ganglia-monitor-aggregator.conf":
source =>
"puppet:///modules/ganglia/upstart/ganglia-monitor-aggregator.conf",
+ before => Service["ganglia-monitor-aggregator"],
mode => 0444;
"/etc/init/ganglia-monitor-aggregator-instance.conf":
source =>
"puppet:///modules/ganglia/upstart/ganglia-monitor-aggregator-instance.conf",
+ before => Service["ganglia-monitor-aggregator"],
mode => 0444;
}
diff --git a/modules/ganglia/manifests/monitor/aggregator/instance.pp
b/modules/ganglia/manifests/monitor/aggregator/instance.pp
index 24d9f77..62e7830 100644
--- a/modules/ganglia/manifests/monitor/aggregator/instance.pp
+++ b/modules/ganglia/manifests/monitor/aggregator/instance.pp
@@ -1,5 +1,4 @@
define ganglia::monitor::aggregator::instance() {
- Class[ganglia::monitor::aggregator] ->
Ganglia::Monitor::Aggregator::Instance[$title]
Ganglia::Monitor::Aggregator::Instance[$title] ->
Service[ganglia-monitor-aggregator]
$aggregator = true
@@ -15,6 +14,7 @@
$cname = "${cluster} ${::site}"
file { "/etc/ganglia/aggregators/${id}.conf":
+ require => File["/etc/ganglia/aggregators"],
mode => 0444,
content => template("ganglia/gmond.conf.erb"),
notify => Service[$title]
--
To view, visit https://gerrit.wikimedia.org/r/53580
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ief8342b7779fc1639f11120377b455fc205ba9e3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
