Merge pull request #313 from iondulgheru/master

Fix master_tops configuration rendering

salt/files/master.d/f_defaults.conf

@@ -746,14 +746,21 @@ rosters:
 {%- do default_keys.append('master_tops') %}
 master_tops:
 {%- for master in cfg_master['master_tops'] -%}
-  {%- if cfg_master['master_tops'][master] is string %}
-  {{ master }}: {{ cfg_master['master_tops'][master] }}
-  {%- else %}
-  {{ master}}:
+  {%- if cfg_master['master_tops'][master] is mapping %}
+  {{ master }}:
     {%- for parameter in cfg_master['master_tops'][master] %}
     {{ parameter }}: {{ cfg_master['master_tops'][master][parameter] }}
     {%- endfor -%}
-  {%- endif -%}
+  {%- elif cfg_master['master_tops'][master] is string %}
+  {{ master }}: {{ cfg_master['master_tops'][master] }}
+  {%- elif cfg_master['master_tops'][master] is iterable %}
+  {{ master }}:
+    {%- for item in cfg_master['master_tops'][master] %}
+      - {{ item }}
+    {%- endfor -%}
+  {%- else %}
+  {{ master }}: {{ cfg_master['master_tops'][master] }}
+  {% endif %}
 {%- endfor %}
 {% endif %}