Commit b41a45ac authored by Vincent Pelletier's avatar Vincent Pelletier

erp5: Publish site-id, as it is auto-generated when not provided.

parent 4b11eb7d
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
"$schema": "http://json-schema.org/draft-04/schema#", "$schema": "http://json-schema.org/draft-04/schema#",
"description": "Values returned by ERP5 instanciation", "description": "Values returned by ERP5 instanciation",
"properties": { "properties": {
"site-id": {
"description": "Chosen ERP5Site object identifier",
"type": "string"
},
"kumofs-url": { "kumofs-url": {
"description": "Persistent memcached access information", "description": "Persistent memcached access information",
"type": "string" "type": "string"
......
...@@ -272,7 +272,7 @@ extra-context = ...@@ -272,7 +272,7 @@ extra-context =
[template-erp5] [template-erp5]
< = download-base < = download-base
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = fabf98dcb9e3d0fa8236397d69293528 md5sum = 0de8f9b4c873975a80bc3b0885c964ab
[template-neo] [template-neo]
< = download-base < = download-base
......
{% if slap_software_type == software_type -%} {% if slap_software_type == software_type -%}
{% set publish_dict = {} -%}
{% set frontend_dict = slapparameter_dict.get('frontend', {}) %} {% set frontend_dict = slapparameter_dict.get('frontend', {}) %}
{% set has_frontend = frontend_dict.get('software-url', '') != '' -%} {% set has_frontend = frontend_dict.get('software-url', '') != '' -%}
{% set site_id = slapparameter_dict.get('site-id', 'erp5') -%} {% set site_id = slapparameter_dict.get('site-id', 'erp5') -%}
{% set publish_dict = {'site-id': site_id} -%}
[request-common] [request-common]
recipe = slapos.cookbook:request.serialised recipe = slapos.cookbook:request.serialised
software-url = ${slap-connection:software-release-url} software-url = ${slap-connection:software-release-url}
......
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