Commit 04c06178 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

haproxy: use bind option to specify listen ip:port instead of putting it in 'listen' line.

that is a long-deprecated syntax and removed in haproxy 1.6.
parent 20cf1fa2
listen %(name)s %(ip)s:%(port)s listen %(name)s
bind %(ip)s:%(port)s
cookie SERVERID insert cookie SERVERID insert
balance roundrobin balance roundrobin
%(httpchk)s %(httpchk)s
......
...@@ -358,7 +358,7 @@ md5sum = 713b22938d7212c8506449bc0508452b ...@@ -358,7 +358,7 @@ md5sum = 713b22938d7212c8506449bc0508452b
[template-haproxy-cfg] [template-haproxy-cfg]
<= download-base <= download-base
filename = haproxy.cfg.in filename = haproxy.cfg.in
md5sum = 7f13123698afe017dfcde9de6beea0f5 md5sum = 92c84313fd42f93565c5e5c3d9582bf2
[bt5-repository] [bt5-repository]
# Format: # Format:
......
...@@ -37,7 +37,8 @@ defaults ...@@ -37,7 +37,8 @@ defaults
option forceclose option forceclose
{% for name, (port, backend_list) in parameter_dict['backend-dict'].items() -%} {% for name, (port, backend_list) in parameter_dict['backend-dict'].items() -%}
listen {{ name }} {{ parameter_dict['ip'] }}:{{ port }} listen {{ name }}
bind {{ parameter_dict['ip'] }}:{{ port }}
http-request set-header X-Balancer-Current-Cookie SERVERID http-request set-header X-Balancer-Current-Cookie SERVERID
{% set has_webdav = [] -%} {% set has_webdav = [] -%}
{% for address, connection_count, webdav in backend_list -%} {% for address, connection_count, webdav in backend_list -%}
......
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