Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53598
Change subject: include network::constants
......................................................................
include network::constants
Change-Id: Ia5d93b64d9486a2bd63b902c283335905aae64d1
---
M modules/ganglia_new/manifests/monitor/aggregator/instance.pp
M modules/ganglia_new/templates/gmond.conf.erb
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/98/53598/1
diff --git a/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
b/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
index c153678..4fcefc6 100644
--- a/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
+++ b/modules/ganglia_new/manifests/monitor/aggregator/instance.pp
@@ -1,7 +1,7 @@
define ganglia_new::monitor::aggregator::instance() {
Ganglia_new::Monitor::Aggregator::Instance[$title] ->
Service[ganglia-monitor-aggregator]
- include ganglia_new::configuration
+ include ganglia_new::configuration, network::constants
$aggregator = true
diff --git a/modules/ganglia_new/templates/gmond.conf.erb
b/modules/ganglia_new/templates/gmond.conf.erb
index 3c2048e..228eb4e 100644
--- a/modules/ganglia_new/templates/gmond.conf.erb
+++ b/modules/ganglia_new/templates/gmond.conf.erb
@@ -44,7 +44,7 @@
port = <%= gmond_port %>
acl {
default = "deny"
-<% scope.lookupvar("::network::all_networks").each do |prefix|
+<% scope.lookupvar("::network::constants::all_networks").each do |prefix|
ip, mask = prefix.split('/')
-%>
acess {
--
To view, visit https://gerrit.wikimedia.org/r/53598
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5d93b64d9486a2bd63b902c283335905aae64d1
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
