apache-frontend: replicate instance handle per frontend parameters

apache-frontend: update documentation for per frontend configuration

software/apache-frontend/README.apache_frontend.txt

@@ -25,6 +25,7 @@ These parameters are :
   * "-frontend-type" : the type to deploy frontends with. (default to 2)
   * "-frontend-quantity" : The quantity of frontends to request (default to "default")
   * "-frontend-i-state": The state of frontend i
+  * "-frontend-config-i-foo": Frontend i will be requested with parameter foo
   * "-frontend-software-release-url": Software release to be used for frontends, default to the current software release
   * "-sla-i-foo" : where "i" is the number of the concerned frontend (between 1 and "-frontend-quantity") and "foo" a sla parameter.
 ex:

software/apache-frontend/common.cfg

@@ -74,7 +74,7 @@ mode = 0644
 [template-apache-replicate]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-apache-replicate.cfg.in
-md5sum = 8ec70e6276daaed240faa5059514929c
+md5sum = 4a386500c21d0b59ce9a679c6110d375
 mode = 0644
 
 [template-slave-list]

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

@@ -38,9 +38,15 @@ context =
 {%   set sla_key = "-sla-%s-" % i -%}
 {%   set sla_key_length = sla_key | length %}
 {%   set sla_parameters = [] %}
+{%   set config_key = "-frontend-config-%s-" % i %}
+{%   set config_key_length = config_key | length %}
+{%   set config_dict = {} %}
 {%   for key in slapparameter_dict.keys() %}
 {%     if key.startswith(sla_key) %}
 {%       do sla_parameters.append(key[sla_key_length:]) %}
+# We check for specific configuration regarding the frontend
+{%     elif key.startswith(config_key) -%}
+{%       do config_dict.__setitem__(key[config_key_length:], slapparameter_dict.pop(key)) %}
 {%     endif -%}
 {%   endfor -%}
 {%   do frontend_list.append(frontend_name) -%}
@@ -53,6 +59,10 @@ name = {{frontend_name}}
 {%   if slapparameter_dict.has_key(state_key) %}
 state = {{ slapparameter_dict.pop(state_key) }}
 {%   endif%}
+extra-config = {{ ' '.join(config_dict.keys()) }}
+{%   for key, value in config_dict.iteritems() -%}
+config-{{ key }} = {{ value }}
+{%   endfor -%}
 {%   if sla_parameters %}
 sla = {{ ' '.join(sla_parameters) }}
 {%     for parameter in sla_parameters -%}
@@ -83,7 +93,7 @@ software-url = ${slap-connection:software-release-url}
 {% endif %}
 software-type = {{frontend_type}}
 return = private-ipv4 public-ipv4 slave-instance-information-list monitor_url
-config = {{ ' '.join(slapparameter_dict.keys()) + ' ' + slave_list_name }}
+config = {{ ' '.join(slapparameter_dict.keys()) + ' ${:extra-config} ' + slave_list_name }}
 {% for parameter, value in slapparameter_dict.iteritems() -%}
 config-{{parameter}} = {{ value }}
 {% endfor -%}