Merge remote-tracking branch 'upstream/master'

munin/files/munin-node.conf

@@ -3,7 +3,7 @@
 # This config file is managed by salt.
 #
 
-{%- for directive, value in config.items() %}
+{%- for directive, value in config|dictsort %}
     {%- if value is string or value is number %}
 {{ directive }} {{ value }}
     {%- else %}

munin/files/munin.conf

@@ -16,20 +16,20 @@
     {%- endif -%}
 {%- endmacro %}
 
-{% for directive, value in globals.items() -%}
+{% for directive, value in globals|dictsort -%}
 {{ print_directive(directive, value) }}
 {% endfor %}
 
-{%- for host, directives in hosts.items() %}
+{%- for host, directives in hosts|dictsort %}
 [{{ host }}]
-    {%- for directive, value in directives.items() %}
+    {%- for directive, value in directives|dictsort %}
     {{ print_directive(directive, value) }}
     {%- endfor %}
 {% endfor %}
 
-{%- for group, directives in groups.items() %}
+{%- for group, directives in groups|dictsort %}
 [{{ group }}]
-    {%- for directive, value in directives.items() %}
+    {%- for directive, value in directives|dictsort %}
     {{ print_directive(directive, value) }}
     {%- endfor %}
 {% endfor %}