X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fmunin%2Ftemplates%2Fmunin.conf_per_node.erb;h=b1cf1d7a95293761c94e9d5e58f32db971fb8c4c;hb=74228f95e562156c74e302c33d5c2692c0c31564;hp=421d0dd611f62c687bec45ca5e11c8fd67d845ee;hpb=63cd5189774fd9905eccb756701ac1e086297fa4;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 421d0dd61..b1cf1d7a9 100644
--- a/modules/munin/templates/munin.conf_per_node.erb
+++ b/modules/munin/templates/munin.conf_per_node.erb
@@ -2,14 +2,5 @@
 ### THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
 ##
 
-[<%= 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 %>
+[<%= @client_fqdn %>]
+address ssh://munin-async@<%= @client_fqdn %>/set-in-authkeys