From: Stephen Gran Date: Sun, 21 Feb 2010 03:27:49 +0000 (+0000) Subject: fix up some usage of keyinfo X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a92c6b00d39a8866a6caf479b690e5d673c83609;p=dsa-puppet.git fix up some usage of keyinfo Signed-off-by: Stephen Gran --- diff --git a/modules/munin-node/templates/munin.conf.erb b/modules/munin-node/templates/munin.conf.erb index 37fc7d66..4231a67b 100644 --- a/modules/munin-node/templates/munin.conf.erb +++ b/modules/munin-node/templates/munin.conf.erb @@ -12,7 +12,7 @@ graph_strategy cgi <%= out = '' localinfo.keys.sort.each do |node| - if localinfo[node]['no_munin'] != "true" + if not localinfo[node]['no_munin'] out += '[' + node + '] address ' + node + ' diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb index 70f37b0b..bbbe456c 100644 --- a/modules/nagios/templates/inc-debian.org.erb +++ b/modules/nagios/templates/inc-debian.org.erb @@ -6,7 +6,7 @@ <%= ournag = [] localinfo.keys.sort.each do |node| - if localinfo[node]['nagiosmaster'] == "true" + if localinfo[node]['nagiosmaster'] ournag << keyinfo[node][0]['ipHostNumber'] end end