Mark Bergsma has submitted this change and it was merged.
Change subject: Revert "Manage aggregator instances through upstart directly"
......................................................................
Revert "Manage aggregator instances through upstart directly"
Puppet doesn't allow specifying env variables for instances
This reverts commit 1f1dae0eac8e8b4ea5ecde8261c8d6b0bd942919
Change-Id: I19519a78401fdd7aa7f1c395b3e1f46c0cf22bba
---
M modules/ganglia_new/manifests/monitor/aggregator.pp
M modules/ganglia_new/manifests/monitor/aggregator/instance.pp
2 files changed, 10 insertions(+), 12 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ganglia_new/manifests/monitor/aggregator.pp
b/modules/ganglia_new/manifests/monitor/aggregator.pp
index c0afab3..2ba6f95 100644
--- a/modules/ganglia_new/manifests/monitor/aggregator.pp
+++ b/modules/ganglia_new/manifests/monitor/aggregator.pp
@@ -18,9 +18,15 @@
mode => 0444;
}
- upstart_job { ["ganglia-monitor-aggregator",
"ganglia-monitor-aggregator-instance"]: }
+ upstart_job { "ganglia-monitor-aggregator-instance": }
# Instantiate aggregators for all clusters
$cluster_list = keys($ganglia_new::configuration::clusters)
instance{ $cluster_list: }
+
+ service { "ganglia-monitor-aggregator":
+ provider => upstart,
+ name => "ganglia-monitor-aggregator",
+ ensure => running
+ }
}
diff --git a/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
b/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
index 7dce11e..4e952c8 100644
--- a/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
+++ b/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
@@ -1,4 +1,6 @@
define ganglia_new::monitor::aggregator::instance() {
+ Ganglia_new::Monitor::Aggregator::Instance[$title] ->
Service[ganglia-monitor-aggregator]
+
include ganglia_new::configuration, network::constants
$aggregator = true
@@ -18,16 +20,6 @@
require => File["/etc/ganglia/aggregators"],
mode => 0444,
content => template("$module_name/gmond.conf.erb"),
- notify => Service["ganglia-monitor-aggregator-instance
ID=${id}"]
- }
-
- service { "ganglia-monitor-aggregator-instance ID=${id}":
- require => File["/etc/ganglia/aggregators/${id}.conf"],
- provider => upstart,
- name => "ganglia-monitor-aggregator-instance",
- start => "/sbin/start ganglia-monitor-aggregator-instance
ID=${id}",
- stop => "/sbin/stop ganglia-monitor-aggregator-instance
ID=${id}",
- restart => "/sbin/restart ganglia-monitor-aggregator-instance
ID=${id}",
- ensure => running
+ notify => Service["ganglia-monitor-aggregator"]
}
}
--
To view, visit https://gerrit.wikimedia.org/r/53775
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I19519a78401fdd7aa7f1c395b3e1f46c0cf22bba
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
