Pyoungmeister has submitted this change and it was merged.
Change subject: Redis ganglia metrics: support password param
......................................................................
Redis ganglia metrics: support password param
This change makes the redis::ganglia class get the password that was supplied
to the parent 'redis' class and adds that to the metric pyconf file. Support
for a password parameter appears to already be present in the Python metric
module itself.
Change-Id: I3522d8619c37acfdb132728064051d5a28d4b1d7
---
M modules/redis/manifests/ganglia.pp
R modules/redis/templates/redis.pyconf.erb
2 files changed, 6 insertions(+), 1 deletion(-)
Approvals:
Pyoungmeister: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/redis/manifests/ganglia.pp
b/modules/redis/manifests/ganglia.pp
index c1bacaf..9680dea 100644
--- a/modules/redis/manifests/ganglia.pp
+++ b/modules/redis/manifests/ganglia.pp
@@ -1,9 +1,13 @@
class redis::ganglia {
+ include redis
+
+ $password = $redis::password
+
file { '/etc/ganglia/conf.d/redis.pyconf':
owner => root,
group => root,
mode => 0444,
- source =>
'puppet:///modules/redis/ganglia/redis.pyconf',
+ content => template('redis/redis.pyconf.erb'),
notify => Service[gmond];
'/usr/lib/ganglia/python_modules/redis.py':
owner => root,
diff --git a/modules/redis/files/ganglia/redis.pyconf
b/modules/redis/templates/redis.pyconf.erb
similarity index 90%
rename from modules/redis/files/ganglia/redis.pyconf
rename to modules/redis/templates/redis.pyconf.erb
index 2e35a88..e105a7b 100644
--- a/modules/redis/files/ganglia/redis.pyconf
+++ b/modules/redis/templates/redis.pyconf.erb
@@ -4,6 +4,7 @@
language = "python"
param host { value = "127.0.0.1" }
param port { value = 6379 }
+ <% if @password %>param password { value = "<%= @password %>" }<% end %>
}
}
collection_group {
--
To view, visit https://gerrit.wikimedia.org/r/62751
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3522d8619c37acfdb132728064051d5a28d4b1d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Pyoungmeister <p...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
