Dzahn has submitted this change and it was merged.
Change subject: ganglia: fix "defined type defined inside a class"
......................................................................
ganglia: fix "defined type defined inside a class"
Change-Id: I5e44cd0704ae8dc9514d3c08c5c40f5190bba9b8
---
M modules/ganglia/manifests/monitor/aggregator.pp
A modules/ganglia/manifests/monitor/aggregator/site_instances.pp
2 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/ganglia/manifests/monitor/aggregator.pp
b/modules/ganglia/manifests/monitor/aggregator.pp
index a350556..e3a8410 100644
--- a/modules/ganglia/manifests/monitor/aggregator.pp
+++ b/modules/ganglia/manifests/monitor/aggregator.pp
@@ -1,3 +1,4 @@
+# sets up a Ganglia Aggregator service
class ganglia::monitor::aggregator($sites) {
require ganglia::monitor::packages
include ganglia::configuration
@@ -30,14 +31,6 @@
before => Service['ganglia-monitor-aggregator'],
}
- }
-
- define site_instances() {
- # Instantiate aggregators for all clusters for this site ($title)
- $cluster_list = suffix(keys($ganglia::configuration::clusters),
"_${title}")
- instance { $cluster_list:
- monitored_site => $title
- }
}
site_instances{ $sites: }
diff --git a/modules/ganglia/manifests/monitor/aggregator/site_instances.pp
b/modules/ganglia/manifests/monitor/aggregator/site_instances.pp
new file mode 100644
index 0000000..340ff9e
--- /dev/null
+++ b/modules/ganglia/manifests/monitor/aggregator/site_instances.pp
@@ -0,0 +1,7 @@
+# Instantiate aggregators for all clusters for this site ($title)
+define ganglia::monitor::aggregator::site_instances() {
+ $cluster_list = suffix(keys($ganglia::configuration::clusters),
"_${title}")
+ instance { $cluster_list:
+ monitored_site => $title
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/278229
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5e44cd0704ae8dc9514d3c08c5c40f5190bba9b8
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
