Commit ef1359e6 by Saurabh Committed by Julien Muchembled

ERP5: fix 'sla-dict' instanciation parameter, and default to same computer

1 parent 2cc2b283
...@@ -224,7 +224,7 @@ md5sum = e40e2e39f4941c6372f4357e8589a5cf ...@@ -224,7 +224,7 @@ md5sum = e40e2e39f4941c6372f4357e8589a5cf
# XXX: "template.cfg" is hardcoded in instanciation recipe # XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in template = ${:_profile_base_location_}/instance.cfg.in
md5sum = c57404cdbbce6b37554719a894f9a88d md5sum = 29a35a63d1d94e120d9825195add31df
extra-context = extra-context =
key mariadb_link_binary template-mariadb:link-binary key mariadb_link_binary template-mariadb:link-binary
key zope_link_binary template-zope:link-binary key zope_link_binary template-zope:link-binary
...@@ -296,7 +296,7 @@ extra-context = ...@@ -296,7 +296,7 @@ extra-context =
[template-erp5] [template-erp5]
< = download-base < = download-base
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = 4aca7b8633c12ad6a0fe2ac569648c82 md5sum = 675c7a5cfc24153889f0803ed6eb5f7e
[template-zeo] [template-zeo]
< = download-base < = download-base
......
...@@ -20,9 +20,11 @@ config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }} ...@@ -20,9 +20,11 @@ config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }}
{% macro sla(name, required=False) -%} {% macro sla(name, required=False) -%}
{% if required or name in sla_dict -%} {% if required or name in sla_dict -%}
{% for k, (v,) in urlparse.parse_qs(slap_dict.pop(name), strict_parsing=1).iteritems() -%} {% for k, (v,) in urlparse.parse_qs(sla_dict.pop(name), strict_parsing=1).iteritems() -%}
sla-{{ k }} = {{ dumps(v) }} sla-{{ k }} = {{ v }}
{% endfor -%} {% endfor -%}
{% else -%}
sla-computer_guid = ${slap-connection:computer-id}
{% endif -%} {% endif -%}
{% endmacro -%} {% endmacro -%}
......
...@@ -19,7 +19,6 @@ context = ...@@ -19,7 +19,6 @@ context =
key ipv4_set slap-configuration:ipv4 key ipv4_set slap-configuration:ipv4
key ipv6_set slap-configuration:ipv6 key ipv6_set slap-configuration:ipv6
key slapparameter_dict slap-configuration:configuration key slapparameter_dict slap-configuration:configuration
key computer_id slap-configuration:computer
raw slapos_core_version {{ slapos_core_version }} raw slapos_core_version {{ slapos_core_version }}
raw logrotate_cfg {{ template_logrotate_base }} raw logrotate_cfg {{ template_logrotate_base }}
${:extra-context} ${:extra-context}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!