NSD: Avoid duplicating the 'list expansion' code in template

templates/config.j2

@@ -1,31 +1,30 @@
+{# If value is a list, expand it by printing several (key, value) pairs.  #}
+{# Otherwise, just print the (key, value) pair unchanged. #}
+{% macro expand_list(key, value) -%}
+{% if value is string or value is number %}
+  {{ key }}: "{{ value }}"
+{% else %}
+{% for subvalue in value %}
+  {{ key }}: "{{ subvalue }}"
+{% endfor %}
+{% endif %}
+{%- endmacro %}
 # NSD configuration, automatically generated by Ansible.
 # Do not edit by hand!
 
 server:
 {% if nsd_common_config is defined %}
   # Common configuration
-{% for key, value in nsd_common_config.iteritems() %}
+{% for key, value in nsd_common_config.iteritems() -%}
-{% if value is string or value is number %}
+{{ expand_list(key, value) }}
-  {{ key }}: "{{ value }}"
+{%- endfor %}
-{% else %}
-{% for subvalue in value %}
-  {{ key }}: "{{ subvalue }}"
-{% endfor %}
-{% endif %}
-{% endfor %}
 {% endif %}
 
 {% if nsd_local_config is defined %}
   # Local configuration
-{% for key, value in nsd_local_config.iteritems() %}
+{% for key, value in nsd_local_config.iteritems() -%}
-{% if value is string or value is number %}
+{{ expand_list(key, value) }}
-  {{ key }}: "{{ value }}"
+{%- endfor %}
-{% else %}
-{% for subvalue in value %}
-  {{ key }}: "{{ subvalue }}"
-{% endfor %}
-{% endif %}
-{% endfor %}
 {% endif %}