From 0908a3de3e3877eb2a4e8e449e2f8eb6fcc441ce Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 20 Mar 2017 17:26:11 +0000 Subject: [PATCH] fix munin.conf_per_node template --- modules/munin/templates/munin.conf_per_node.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/munin/templates/munin.conf_per_node.erb b/modules/munin/templates/munin.conf_per_node.erb index 421d0dd61..64224bdaf 100644 --- a/modules/munin/templates/munin.conf_per_node.erb +++ b/modules/munin/templates/munin.conf_per_node.erb @@ -2,14 +2,14 @@ ### THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. ## -[<%= client_fqdn %>] +[<%= @client_fqdn %>] <% # variables are different whether or not they go via the stored config thing. # on the host that actually gets the config, client_munin_async is a String, saying "true", # from other hosts it's an actual boolean, i.e. an instance of either FalseClass or TrueClass %> -<%- if has_variable?('client_munin_async') and ((client_munin_async.kind_of?(String) and client_munin_async == "true") or (client_munin_async.kind_of?(TrueClass))) %> - address ssh://munin-async@<%= client_fqdn %>/set-in-authkeys +<%- if has_variable?('client_munin_async') and ((@client_munin_async.kind_of?(String) and @client_munin_async == "true") or (@client_munin_async.kind_of?(TrueClass))) %> + address ssh://munin-async@<%= @client_fqdn %>/set-in-authkeys <%- else %> - address <%= client_ipaddress %> + address <%= @client_ipaddress %> <%- end %> -- 2.20.1