Commit 6807c18f authored by Łukasz Nowak's avatar Łukasz Nowak

XXX - checkpoint

parent e376300c
...@@ -26,7 +26,7 @@ md5sum = d93042d602fb8d57e2bcc7691ca4807d ...@@ -26,7 +26,7 @@ md5sum = d93042d602fb8d57e2bcc7691ca4807d
[profile-master] [profile-master]
filename = instance-master.cfg.in filename = instance-master.cfg.in
md5sum = d16bbec7562b3c8f6eb17d612b72215c md5sum = f6e83274dd2ed507b924fb2a8a14f703
[profile-slave-list] [profile-slave-list]
filename = instance-slave-list.cfg.in filename = instance-slave-list.cfg.in
...@@ -34,7 +34,7 @@ md5sum = 0634ebd7d884f0083d8fdf8ab2af08f2 ...@@ -34,7 +34,7 @@ md5sum = 0634ebd7d884f0083d8fdf8ab2af08f2
[profile-master-publish-slave-information] [profile-master-publish-slave-information]
filename = instance-master-publish-slave-information.cfg.in filename = instance-master-publish-slave-information.cfg.in
md5sum = cba4d995962f7fbeae3f61c9372c4181 md5sum = 996a565cf45316450da8dfcab40916d4
[template-frontend-haproxy-configuration] [template-frontend-haproxy-configuration]
_update_hash_filename_ = templates/frontend-haproxy.cfg.in _update_hash_filename_ = templates/frontend-haproxy.cfg.in
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
# XXX: {{ slave_information_dict }}
{% for slave_reference, rejected_info_list in rejected_slave_information['rejected-slave-dict'].items() %} {% for slave_reference, rejected_info_list in rejected_slave_information['rejected-slave-dict'].items() %}
{% if slave_reference not in slave_information_dict %} {% if slave_reference not in slave_information_dict %}
{% do slave_information_dict.__setitem__(slave_reference, {}) %} {% do slave_information_dict.__setitem__(slave_reference, {}) %}
......
...@@ -558,13 +558,13 @@ warning-slave-dict = {{ dumps(warning_slave_dict) }} ...@@ -558,13 +558,13 @@ warning-slave-dict = {{ dumps(warning_slave_dict) }}
{% endfor %} {% endfor %}
[active-slave-instance] [active-slave-instance]
{% set active_slave_instance_list = [] %} {%- set active_slave_instance_list = [] %}
{% for slave_instance in instance_parameter_dict['slave-instance-list'] %} {%- for slave_instance in instance_parameter_dict['slave-instance-list'] %}
{# Provide a list of slave titles send by master, in order to filter out already destroyed slaves #} {#- Provide a list of slave titles send by master, in order to filter out already destroyed slaves #}
{# Note: This functionality is not yet covered by tests, please modify with care #} {# Note: This functionality is not yet covered by tests, please modify with care #}
{% do active_slave_instance_list.append(slave_instance['slave_reference']) %} {%- do active_slave_instance_list.append(slave_instance['slave_reference']) %}
{% endfor %} {%- endfor %}
{# sort_keys are important in order to avoid shuffling parameters on each run #} {#- sort_keys are important in order to avoid shuffling parameters on each run #}
active-slave-instance-list = {{ json_module.dumps(active_slave_instance_list, sort_keys=True) }} active-slave-instance-list = {{ json_module.dumps(active_slave_instance_list, sort_keys=True) }}
[frontend-information] [frontend-information]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment