Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53597
Change subject: include ganglia_new::configuration
......................................................................
include ganglia_new::configuration
Change-Id: If0e97fc3ce4314c2f207e85371a0c31587bc57ba
---
M modules/ganglia_new/manifests/monitor/aggregator.pp
M modules/ganglia_new/manifests/monitor/aggregator/instance.pp
M modules/ganglia_new/manifests/monitor/config.pp
3 files changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/97/53597/1
diff --git a/modules/ganglia_new/manifests/monitor/aggregator.pp
b/modules/ganglia_new/manifests/monitor/aggregator.pp
index b18c9ce..2ba6f95 100644
--- a/modules/ganglia_new/manifests/monitor/aggregator.pp
+++ b/modules/ganglia_new/manifests/monitor/aggregator.pp
@@ -1,5 +1,6 @@
class ganglia_new::monitor::aggregator {
require ganglia_new::monitor::packages
+ include ganglia_new::configuration
system_role { "ganglia::monitor::aggregator": description => "central
Ganglia aggregator" }
diff --git a/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
b/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
index 9ee5a7c..c153678 100644
--- a/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
+++ b/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
@@ -1,6 +1,8 @@
define ganglia_new::monitor::aggregator::instance() {
Ganglia_new::Monitor::Aggregator::Instance[$title] ->
Service[ganglia-monitor-aggregator]
+ include ganglia_new::configuration
+
$aggregator = true
# TODO: support multiple $site
diff --git a/modules/ganglia_new/manifests/monitor/config.pp
b/modules/ganglia_new/manifests/monitor/config.pp
index f6255cd..1eb73f4 100644
--- a/modules/ganglia_new/manifests/monitor/config.pp
+++ b/modules/ganglia_new/manifests/monitor/config.pp
@@ -1,5 +1,6 @@
class ganglia_new::monitor::config($cluster) {
require ganglia_new::monitor::packages
+ include ganglia_new::configuration
$aggregator = false
$id = $ganglia_new::configuration::clusters[$cluster]['id']
--
To view, visit https://gerrit.wikimedia.org/r/53597
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If0e97fc3ce4314c2f207e85371a0c31587bc57ba
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
