caddy-frontend: Drop another duplicated parameter

software/caddy-frontend/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [template]
 filename = instance.cfg.in
-md5sum = 9c8ef6434cd36617c51b4245f6968593
+md5sum = 011889ce0d72c5986eddf27760446331
 
 [profile-common]
 filename = instance-common.cfg.in
@@ -26,7 +26,7 @@ md5sum = 48d549d1327859cac83536806de8ee99
 
 [profile-caddy-replicate]
 filename = instance-apache-replicate.cfg.in
-md5sum = 04feda2f6b2f50615384c773843d895e
+md5sum = 9baf4802354309b99d58e45028c90d0f
 
 [profile-slave-list]
 _update_hash_filename_ = templates/apache-custom-slave-list.cfg.in

software/caddy-frontend/instance-apache-replicate.cfg.in

@@ -92,7 +92,7 @@ context =
 {% set rejected_slave_title_dict = {} %}
 {% set warning_slave_dict = {} %}
 {% set used_host_list = [] %}
-{% for slave in sorted(slave_instance_list) %}
+{% for slave in sorted(instance_parameter_dict['slave-instance-list']) %}
 {%   set slave_error_list = [] %}
 {%   set slave_warning_list = [] %}
 {%   set slave_server_alias_unclashed = [] %}
@@ -260,7 +260,7 @@ sla-{{ parameter }} = {{ value }}
 <= monitor-publish
 recipe = slapos.cookbook:publish
 domain = {{ slapparameter_dict.get('domain') }}
-slave-amount = {{ slave_instance_list | length }}
+slave-amount = {{ instance_parameter_dict['slave-instance-list'] | length }}
 accepted-slave-amount = {{ authorized_slave_list | length }}
 rejected-slave-amount = {{ rejected_slave_dict | length }}
 backend-client-caucase-url = {{ caucase_url }}
@@ -365,7 +365,7 @@ sla-{{ key[sla_kedifa_key_length:] }} = {{ slapparameter_dict.pop(key) }}
 
 [active-slave-instance]
 {% set active_slave_instance_list = [] %}
-{% for slave_instance in 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 #}
 {# Note: This functionality is not yet covered by tests, please modify with care #}
 {%   do active_slave_instance_list.append(slave_instance['slave_reference']) %}

software/caddy-frontend/instance.cfg.in

@@ -15,7 +15,6 @@ extra-context =
 context =
     import json_module json
     key slapparameter_dict instance-parameter:configuration
-    key slave_instance_list instance-parameter:slave-instance-list
     section instance_parameter_dict instance-parameter
     section software_parameter_dict software-parameter-section
     ${:extra-context}