Commit 85079f3b authored by Levin Zimmermann's avatar Levin Zimmermann

missed part of...

missed part of nexedi/slapos@2fc522bf
parent 5f65d698
...@@ -90,7 +90,7 @@ md5sum = c3e3f8cd985407931b705d15bdedc8d9 ...@@ -90,7 +90,7 @@ md5sum = c3e3f8cd985407931b705d15bdedc8d9
[template-balancer] [template-balancer]
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
md5sum = 261074cf5d8e67eacdf0390ba9e1740e md5sum = 628cf03d8b4ca67bbd13c29dd4676471
[template-haproxy-cfg] [template-haproxy-cfg]
filename = haproxy.cfg.in filename = haproxy.cfg.in
......
...@@ -344,13 +344,7 @@ config-port = ${haproxy-cfg-parameter-dict:haproxy-promise-port} ...@@ -344,13 +344,7 @@ config-port = ${haproxy-cfg-parameter-dict:haproxy-promise-port}
[{{ section('publish') }}] [{{ section('publish') }}]
recipe = slapos.cookbook:publish.serialised recipe = slapos.cookbook:publish.serialised
{% for family_name, (port, scheme, _, _, _) in haproxy_dict.items() -%} # note: some values are pushed by haproxy-cfg-parameter-dict
{{ family_name ~ '-v6' }} = {% if ipv6_set %}{{ scheme ~ '://[' ~ ipv6 ~ ']:' ~ port }}{% endif %}
{{ family_name }} = {{ scheme ~ '://' ~ ipv4 ~ ':' ~ port }}
{% endfor -%}
{% for family_name, test_runner_url_list in test_runner_url_dict.items() -%}
{{ family_name ~ '-test-runner-url-list' }} = {{ dumps(test_runner_url_list) }}
{% endfor -%}
monitor-base-url = ${monitor-publish-parameters:monitor-base-url} monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
[{{ section('logrotate-rsyslogd') }}] [{{ section('logrotate-rsyslogd') }}]
......
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