diff --git a/collectd/extra-plugins.sls b/collectd/extra-plugins.sls index e85a9d0..35941a2 100644 --- a/collectd/extra-plugins.sls +++ b/collectd/extra-plugins.sls @@ -3,7 +3,7 @@ include: - collectd -{%- for plugin, plugin_settings in collectd_settings.plugins.extra.iteritems() %} +{%- for plugin, plugin_settings in collectd_settings.plugins.extra.items() %} {{ collectd_settings.plugindirconfig }}/{{ plugin }}.conf: file.managed: - source: salt://collectd/files/extra.conf diff --git a/collectd/files/extra.conf b/collectd/files/extra.conf index 1eeccd2..bda4d15 100644 --- a/collectd/files/extra.conf +++ b/collectd/files/extra.conf @@ -20,7 +20,7 @@ false LoadPlugin {{ plugin }} - {%- for name, value in (plugin_settings|default({})).iteritems() %} + {%- for name, value in (plugin_settings|default({})).items() %} {{ name }} {{ format_value(value )}} {%- endfor %}