software/rapid-cdn: Mininimize produced files

There is no reason to have so many empty lines, as other tools can have
troubles with processing it.

software/rapid-cdn/buildout.hash.cfg

@@ -26,7 +26,7 @@ md5sum = 4a53b09ba4cbf15e32a5088cc81db5ea
 
 [profile-master]
 filename = instance-master.cfg.in
-md5sum = 653e8249ee71c3fa71b172fa3d2a4207
+md5sum = 78c556911944339f0c03c8416db8dbaa
 
 [profile-slave-list]
 filename = instance-slave-list.cfg.in
@@ -34,7 +34,7 @@ md5sum = 8d6d2280ad47b431c433495bf9809adc
 
 [profile-master-publish-slave-information]
 filename = instance-master-publish-slave-information.cfg.in
-md5sum = cba4d995962f7fbeae3f61c9372c4181
+md5sum = 91f4e406ef66fb6c3fac5d4af06ee0ca
 
 [template-frontend-haproxy-configuration]
 _update_hash_filename_ = templates/frontend-haproxy.cfg.in

software/rapid-cdn/instance-master-publish-slave-information.cfg.in

-{% set part_list = [] %}
-{% set slave_information_dict = {} %}
+{%- set part_list = [] %}
+{%- set slave_information_dict = {} %}
 
 # regroup slave information from all frontends
-{% for frontend, slave_list_raw in slave_information.items() %}
-{%   if slave_list_raw %}
-{%     set slave_list = json_module.loads(slave_list_raw) %}
-{%   else %}
-{%    set slave_list = [] %}
-{%   endif %}
-{%   for slave_dict in slave_list %}
-{%     set slave_reference = slave_dict.pop('slave-reference') %}
-{%     set log_access_url = slave_dict.pop('log-access', '') %}
-{%     set current_slave_dict = slave_information_dict.get(slave_reference, {}) %}
-{%     do current_slave_dict.update(slave_dict) %}
-{%     set log_access_list = current_slave_dict.get('log-access-urls', []) %}
-{%     do log_access_list.append( frontend + ': ' + log_access_url) %}
-{%     do current_slave_dict.__setitem__(
+{%- for frontend, slave_list_raw in slave_information.items() %}
+{%-   if slave_list_raw %}
+{%-     set slave_list = json_module.loads(slave_list_raw) %}
+{%-   else %}
+{%-    set slave_list = [] %}
+{%-   endif %}
+{%-   for slave_dict in slave_list %}
+{%-     set slave_reference = slave_dict.pop('slave-reference') %}
+{%-     set log_access_url = slave_dict.pop('log-access', '') %}
+{%-     set current_slave_dict = slave_information_dict.get(slave_reference, {}) %}
+{%-     do current_slave_dict.update(slave_dict) %}
+{%-     set log_access_list = current_slave_dict.get('log-access-urls', []) %}
+{%-     do log_access_list.append( frontend + ': ' + log_access_url) %}
+{%-     do current_slave_dict.__setitem__(
             'log-access-urls',
             log_access_list
             ) %}
-{%     do current_slave_dict.__setitem__(
+{%-     do current_slave_dict.__setitem__(
             'replication_number',
             current_slave_dict.get('replication_number', 0) + 1
             ) %}
-{%     do slave_information_dict.__setitem__(slave_reference, current_slave_dict) %}
-{%   endfor %}
-{% endfor %}
+{%-     do slave_information_dict.__setitem__(slave_reference, current_slave_dict) %}
+{%-   endfor %}
+{%- endfor %}
 
-{% for slave_reference, rejected_info_list in rejected_slave_information['rejected-slave-dict'].items() %}
-{%   if slave_reference not in slave_information_dict %}
-{%     do slave_information_dict.__setitem__(slave_reference, {}) %}
-{%   endif %}
-{%   do slave_information_dict[slave_reference].__setitem__('request-error-list', json_module.dumps(rejected_info_list)) %}
-{% endfor %}
+{%- for slave_reference, rejected_info_list in rejected_slave_information['rejected-slave-dict'].items() %}
+{%-   if slave_reference not in slave_information_dict %}
+{%-     do slave_information_dict.__setitem__(slave_reference, {}) %}
+{%-   endif %}
+{%-   do slave_information_dict[slave_reference].__setitem__('request-error-list', json_module.dumps(rejected_info_list)) %}
+{%- endfor %}
 
-{% for slave_reference, warning_info_list in warning_slave_information['warning-slave-dict'].items() %}
-{%   if slave_reference not in slave_information_dict %}
-{%     do slave_information_dict.__setitem__(slave_reference, {}) %}
-{%   endif %}
-{%   do slave_information_dict[slave_reference].__setitem__('warning-list', json_module.dumps(warning_info_list)) %}
-{% endfor %}
+{%- for slave_reference, warning_info_list in warning_slave_information['warning-slave-dict'].items() %}
+{%-   if slave_reference not in slave_information_dict %}
+{%-     do slave_information_dict.__setitem__(slave_reference, {}) %}
+{%-   endif %}
+{%-   do slave_information_dict[slave_reference].__setitem__('warning-list', json_module.dumps(warning_info_list)) %}
+{%- endfor %}
 
-{% for slave_reference, kedifa_dict in json_module.loads(slave_kedifa_information).items() %}
-{%   if slave_reference not in rejected_slave_information['rejected-slave-dict'] %}
-{%     if slave_reference not in slave_information_dict %}
-{%       do slave_information_dict.__setitem__(slave_reference, {}) %}
-{%     endif %}
-{%     do slave_information_dict[slave_reference].__setitem__('key-generate-auth-url', kedifa_dict['key-generate-auth-url']) %}
-{%     do slave_information_dict[slave_reference].__setitem__('key-upload-url', kedifa_dict['key-upload-url']) %}
-{%     do slave_information_dict[slave_reference].__setitem__('kedifa-caucase-url', kedifa_dict['kedifa-caucase-url']) %}
-{%   endif %}
-{% endfor %}
+{%- for slave_reference, kedifa_dict in json_module.loads(slave_kedifa_information).items() %}
+{%-   if slave_reference not in rejected_slave_information['rejected-slave-dict'] %}
+{%-     if slave_reference not in slave_information_dict %}
+{%-       do slave_information_dict.__setitem__(slave_reference, {}) %}
+{%-     endif %}
+{%-     do slave_information_dict[slave_reference].__setitem__('key-generate-auth-url', kedifa_dict['key-generate-auth-url']) %}
+{%-     do slave_information_dict[slave_reference].__setitem__('key-upload-url', kedifa_dict['key-upload-url']) %}
+{%-     do slave_information_dict[slave_reference].__setitem__('kedifa-caucase-url', kedifa_dict['kedifa-caucase-url']) %}
+{%-   endif %}
+{%- endfor %}
 
 [common-frontend-information]
-{% for frontend_key, frontend_value in frontend_information.items() %}
+{%- for frontend_key, frontend_value in frontend_information.items() %}
 {{ frontend_key }} = {{ frontend_value }}
-{% endfor %}
+{%- endfor %}
 
 # Publish information for each slave
-{% set active_slave_instance_list = json_module.loads(active_slave_instance_dict['active-slave-instance-list']) %}
-{% for slave_reference, slave_information in slave_information_dict.items() %}
+{%- set active_slave_instance_list = json_module.loads(active_slave_instance_dict['active-slave-instance-list']) %}
+{%- for slave_reference, slave_information in slave_information_dict.items() %}
 {#   Filter out destroyed, so not existing anymore, slaves #}
 {#   Note: This functionality is not yet covered by tests, please modify with care #}
-{%   if slave_reference in active_slave_instance_list %}
-{%     set publish_section_title = 'publish-%s' % slave_reference %}
-{%     do part_list.append(publish_section_title) %}
+{%-   if slave_reference in active_slave_instance_list %}
+{%-     set publish_section_title = 'publish-%s' % slave_reference %}
+{%-     do part_list.append(publish_section_title) %}
 [{{ publish_section_title }}]
 <= common-frontend-information
 recipe = slapos.cookbook:publish_failsafe
 -error-status-file = {{ publish_failsafe_error }}/{{ slave_reference }}-error.status
 -slave-reference = {{ slave_reference }}
-{%     set log_access_url = slave_information.pop('log-access-urls', None) %}
-{%     if log_access_url %}
+{%-     set log_access_url = slave_information.pop('log-access-urls', None) %}
+{%-     if log_access_url %}
 {# sort_keys are important in order to avoid shuffling parameters on each run #}
 log-access-url = {{ dumps(json_module.dumps(log_access_url, sort_keys=True)) }}
-{%     endif %}
-{%     for key, value in slave_information.items() %}
+{%-     endif %}
+{%-     for key, value in slave_information.items() %}
 {{ key }} = {{ dumps(value) }}
-{%     endfor %}
-{%   endif %}
-{% endfor %}
+{%-     endfor %}
+{%-   endif %}
+{%- endfor %}
 
 [buildout]
 extends = {{ profile_common }}
 parts =
 {% for part in part_list %}
-{{ '  %s' % part }}
+{{- '  %s' % part }}
 {% endfor %}