Merge pull request #77 from rhertzog/misc-bugfixes

FIxes for nodegroups/log_granular_levels settings and small cleanups

salt/files/master.d/_defaults.conf

@@ -604,10 +604,10 @@ fileserver_backend:
 gitfs_remotes:
 {%- for remote in master['gitfs_remotes'] %}
 {%- if remote is iterable and remote is not string %}
-  {%- for repo, children in remote.iteritems() %}
+  {%- for repo, children in remote.items() %}
     - {{ repo }}:
   {%- for child in children %}
-    {%- for key, value in child.iteritems() %}
+    {%- for key, value in child.items() %}
       - {{ key }}: {{ value }}
     {%- endfor -%}
   {%- endfor -%}
@@ -860,12 +860,12 @@ peer_run:
 #
 {% if 'log_granular_levels' in master %}
 log_granular_levels:
-  {% for name, lvl in master['log_granular_levels'] %}
+  {% for name, lvl in master['log_granular_levels'].items() %}
   {{ name }}: {{ lvl }}
   {% endfor %}
 {% elif 'log_granular_levels' in salt %}
 log_granular_levels:
-  {% for name, lvl in salt['log_granular_levels'] %}
+  {% for name, lvl in salt['log_granular_levels'].items() %}
   {{ name }}: {{ lvl }}
   {% endfor %}
 {% else %}
@@ -882,12 +882,12 @@ log_granular_levels:
 #  group2: 'G@os:Debian and foo.domain.com'
 {% if 'nodegroups' in master %}
 nodegroups:
-  {% for name, lvl in master['nodegroups'] %}
+  {% for name, lvl in master['nodegroups'].items() %}
   {{ name }}: {{ lvl }}
   {% endfor %}
 {% elif 'nodegroups' in salt %}
 nodegroups:
-  {% for name, lvl in salt['nodegroups'] %}
+  {% for name, lvl in salt['nodegroups'].items() %}
   {{ name }}: {{ lvl }}
   {% endfor %}
 {% endif %}
@@ -933,7 +933,7 @@ win_gitrepos:
 #####             Halite             #####
 ##########################################
 halite:
-  {% for name, value in master['halite'].iteritems() %}
+  {% for name, value in master['halite'].items() %}
   {{ name }}: {{ value }}
   {% endfor %}
 {% endif %}
@@ -942,7 +942,7 @@ halite:
 #####         rest_cherrypy          #####
 ##########################################
 rest_cherrypy:
-  {% for name, value in master['rest_cherrypy'].iteritems() %}
+  {% for name, value in master['rest_cherrypy'].items() %}
   {{ name }}: {{ value }}
   {% endfor %}
 {% endif %}

salt/files/minion.d/_defaults.conf

@@ -449,10 +449,10 @@ file_client: local
 gitfs_remotes:
 {%- for remote in minion['gitfs_remotes'] %}
 {%- if remote is iterable and remote is not string %}
-  {%- for repo, children in remote.iteritems() %}
+  {%- for repo, children in remote.items() %}
     - {{ repo }}:
   {%- for child in children %}
-    {%- for key, value in child.iteritems() %}
+    {%- for key, value in child.items() %}
       - {{ key }}: {{ value }}
     {%- endfor -%}
   {%- endfor -%}