Commit 3d526ee6 authored by Julien Muchembled's avatar Julien Muchembled

slapos-master: follow up changes on ERP5 stack

parent dcfbf929
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# not need these here). # not need these here).
[template-erp5] [template-erp5]
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = 1c8cf3013bd8a4b05e62a8742089c59b md5sum = 7f3318aec3b682c3379609ccdd659411
[template-balancer] [template-balancer]
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
......
...@@ -442,7 +442,7 @@ recipe = slapos.cookbook:publish-early ...@@ -442,7 +442,7 @@ recipe = slapos.cookbook:publish-early
{%- endif %} {%- endif %}
{%- if test_runner_enabled %} {%- if test_runner_enabled %}
{%- for zope_family_name in zope_family_name_list %} {%- for zope_family_name in zope_family_name_list %}
{{ zope_family_name }}-test-runner-url-list default-balancer-test-runner-url-list:default {{ zope_family_name }}-test-runner-url-list default-balancer-test-runner-url-list:{{ zope_family_name }}
{%- endfor %} {%- endfor %}
{%- endif %} {%- endif %}
{%- if neo %} {%- if neo %}
...@@ -458,12 +458,15 @@ inituser-password = {{ dumps(inituser_password) }} ...@@ -458,12 +458,15 @@ inituser-password = {{ dumps(inituser_password) }}
{%- set deadlock_debugger_password = slapparameter_dict.get('deadlock-debugger-password') -%} {%- set deadlock_debugger_password = slapparameter_dict.get('deadlock-debugger-password') -%}
{%- if deadlock_debugger_password %} {%- if deadlock_debugger_password %}
deadlock-debugger-password = {{ dumps(deadlock_debugger_password) }} deadlock-debugger-password = {{ dumps(deadlock_debugger_password) }}
{%- endif %} {% endif %}
{%- if test_runner_enabled %}
[default-balancer-test-runner-url-list] [default-balancer-test-runner-url-list]
recipe = recipe =
default = not-ready {%- for zope_family_name in zope_family_name_list %}
{{ zope_family_name }} = not-ready
{%- endfor %}
{%- endif %}
[gen-password] [gen-password]
recipe = slapos.cookbook:generate.password recipe = slapos.cookbook:generate.password
......
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