software/caddy-frontend: Allow to set software release per node

See merge request !815

software/caddy-frontend/README.caddy_frontend.rst

@@ -23,11 +23,11 @@ Slaves of the root instance are sent as a parameter to requested frontends which
 
 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-type`` : the type to deploy frontends with. (default to "default")
+  * ``-frontend-quantity`` : The quantity of frontends to request (default to "1")
   * ``-frontend-i-state``: The state of frontend i
+  * ``-frontend-i-software-release-url``: Software release to be used for frontends, default to the current software release
   * ``-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.
 
 For example::
@@ -36,10 +36,10 @@ For example::
   <parameter id="-frontend-type">custom-personal</parameter>
   <parameter id="-frontend-2-state">stopped</parameter>
   <parameter id="-sla-3-computer_guid">COMP-1234</parameter>
-  <parameter id="-frontend-software-release-url">https://lab.nexedi.com/nexedi/slapos/raw/someid/software/caddy-frontend/software.cfg</parameter>
+  <parameter id="-frontend-3-software-release-url">https://lab.nexedi.com/nexedi/slapos/raw/someid/software/caddy-frontend/software.cfg</parameter>
 
 
-will request the third frontend on COMP-1234. All frontends will be of software type ``custom-personal``. The second frontend will be requested with the state stopped
+will request the third frontend on COMP-1234 and with SR https://lab.nexedi.com/nexedi/slapos/raw/someid/software/caddy-frontend/software.cfg. All frontends will be of software type ``custom-personal``. The second frontend will be requested with the state stopped.
 
 *Note*: the way slaves are transformed to a parameter avoid modifying more than 3 lines in the frontend logic.
 
@@ -392,6 +392,8 @@ Additional partition with KeDiFa (Key Distribution Facility) is by default reque
 
 By adding to the request keys like ``-sla-kedifa-<key>`` it is possible to provide SLA information for kedifa partition. Eg to put it on computer ``couscous`` it shall be ``-sla-kedifa-computer_guid: couscous``.
 
+Also ``-kedifa-software-release-url`` can be used to override the software release for kedifa partition.
+
 Notes
 =====
 

software/caddy-frontend/buildout.hash.cfg

@@ -26,7 +26,7 @@ md5sum = 1709085d62f46b22cbe9369fe324bb49
 
 [template-caddy-replicate]
 filename = instance-apache-replicate.cfg.in
-md5sum = 19debfbc27c464f451b1eb5bb5ce3c84
+md5sum = b684aacbb7b2a6eec3ca3ab06c61a92c
 
 [template-slave-list]
 _update_hash_filename_ = templates/apache-custom-slave-list.cfg.in

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

@@ -75,13 +75,15 @@ context =
 {%   do part_list.append(request_section_title) %}
 # Filling request dict for slave
 {%   set state_key = "-frontend-%s-state" % i %}
-{%   do request_dict.__setitem__(request_section_title,
-                                  {
+{%   set request_content_dict = {
                                   'config': config_dict,
                                   'name': frontend_name,
                                   'sla': sla_dict,
                                   'state': slapparameter_dict.pop(state_key, None)
-                                  }) %}
+                                  } %}
+{%   set frontend_software_url_key = "-frontend-%s-software-release-url" % i %}
+{%   do request_content_dict.__setitem__('software-url', slapparameter_dict.get(frontend_software_url_key) or '${slap-connection:software-release-url}') %}
+{%   do request_dict.__setitem__(request_section_title, request_content_dict) %}
 {% endfor %}
 
 {% set authorized_slave_string_list = [] %}
@@ -212,12 +214,6 @@ config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains',
 config-monitor-username = ${monitor-instance-parameter:username}
 config-monitor-password = ${monitor-htpasswd:passwd}
 
-{% set frontend_software_url_key = "-frontend-software-release-url" %}
-{% if slapparameter_dict.has_key(frontend_software_url_key) %}
-software-url = {{ slapparameter_dict.pop(frontend_software_url_key) }}
-{% else %}
-software-url = ${slap-connection:software-release-url}
-{% endif %}
 software-type = {{frontend_type}}
 return = private-ipv4 public-ipv4 slave-instance-information-list monitor-base-url backend-client-csr_id-url csr_id-url csr_id-certificate
 
@@ -226,6 +222,7 @@ return = private-ipv4 public-ipv4 slave-instance-information-list monitor-base-u
 [{{section}}]
 <= replicate
 name = {{ frontend_request.get('name') }}
+software-url = {{ frontend_request['software-url'] }}
 {%   if state %}
 state = {{ state }}
 {%   endif %}
@@ -328,9 +325,9 @@ config-{{ key }} = {{ dumps(slapparameter_dict[key]) }}
 config-slave-list = {{ dumps(authorized_slave_list) }}
 config-cluster-identification = {{ cluster_identification }}
 
-{% set frontend_software_url_key = "-frontend-software-release-url" %}
-{% if slapparameter_dict.has_key(frontend_software_url_key) %}
-software-url = {{ slapparameter_dict.pop(frontend_software_url_key) }}
+{% set software_url_key = "-kedifa-software-release-url" %}
+{% if slapparameter_dict.has_key(software_url_key) %}
+software-url = {{ slapparameter_dict.pop(software_url_key) }}
 {% else %}
 software-url = ${slap-connection:software-release-url}
 {% endif %}