All our munin is munin-async these days

[mirror/dsa-puppet.git] / modules / munin / templates / munin.conf_per_node.erb

diff --git a/modules/munin/templates/munin.conf_per_node.erb b/modules/munin/templates/munin.conf_per_node.erb
index 421d0dd..b1cf1d7 100644 (file)
--- 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