X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Ftemplates%2Fmunin.conf_per_node.erb;h=b1cf1d7a95293761c94e9d5e58f32db971fb8c4c;hb=43fff1fc191e08503bb43a5b9fb28f0f2c93665e;hp=64224bdafc3f5d1b68bd73ed950b777cf8ea1d4f;hpb=0908a3de3e3877eb2a4e8e449e2f8eb6fcc441ce;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin/templates/munin.conf_per_node.erb b/modules/munin/templates/munin.conf_per_node.erb
index 64224bdaf..b1cf1d7a9 100644
--- a/modules/munin/templates/munin.conf_per_node.erb
+++ b/modules/munin/templates/munin.conf_per_node.erb
@@ -3,13 +3,4 @@
 ##
 
 [<%= @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
-<%- else %>
-    address <%= @client_ipaddress %>
-<%- end %>
+address ssh://munin-async@<%= @client_fqdn %>/set-in-authkeys