openstack
/
neutron-lbaas
Code Issues Proposed changes

Merge "Switch HAProxy health check timeout to seconds"

This commit is contained in:
Jenkins 2016-10-04 18:55:09 +00:00 committed by Gerrit Code Review
parent fe0a7ba561 75faa63ee4
commit 415dbc7f36
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron_lbaas/drivers/haproxy/templates/haproxy_proxies.j2
View File

@ -69,7 +69,7 @@ backend {{ pool.id }}
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if pool.health_monitor %} {% if pool.health_monitor %}
timeout check {{ pool.health_monitor.timeout }} timeout check {{ pool.health_monitor.timeout }}s
{% if pool.health_monitor.type == constants.HEALTH_MONITOR_HTTP or pool.health_monitor.type == constants.HEALTH_MONITOR_HTTPS %} {% if pool.health_monitor.type == constants.HEALTH_MONITOR_HTTP or pool.health_monitor.type == constants.HEALTH_MONITOR_HTTPS %}
option httpchk {{ pool.health_monitor.http_method }} {{ pool.health_monitor.url_path }} option httpchk {{ pool.health_monitor.http_method }} {{ pool.health_monitor.url_path }}
http-check expect rstatus {{ pool.health_monitor.expected_codes }} http-check expect rstatus {{ pool.health_monitor.expected_codes }}

12
neutron_lbaas/tests/unit/drivers/haproxy/test_jinja_cfg.py
View File

@ -64,7 +64,7 @@ class TestHaproxyCfg(base.BaseTestCase):
" mode http\n" " mode http\n"
" balance roundrobin\n" " balance roundrobin\n"
" cookie SRV insert indirect nocache\n" " cookie SRV insert indirect nocache\n"
" timeout check 31\n" " timeout check 31s\n"
" option httpchk GET /index.html\n" " option httpchk GET /index.html\n"
" http-check expect rstatus %s\n" " http-check expect rstatus %s\n"
" server sample_member_id_1 10.0.0.99:82" " server sample_member_id_1 10.0.0.99:82"
@ -109,7 +109,7 @@ class TestHaproxyCfg(base.BaseTestCase):
" mode http\n" " mode http\n"
" balance roundrobin\n" " balance roundrobin\n"
" cookie SRV insert indirect nocache\n" " cookie SRV insert indirect nocache\n"
" timeout check 31\n" " timeout check 31s\n"
" option httpchk GET /index.html\n" " option httpchk GET /index.html\n"
" http-check expect rstatus %s\n" " http-check expect rstatus %s\n"
" server sample_member_id_1 10.0.0.99:82 " " server sample_member_id_1 10.0.0.99:82 "
@ -141,7 +141,7 @@ class TestHaproxyCfg(base.BaseTestCase):
" mode http\n" " mode http\n"
" balance roundrobin\n" " balance roundrobin\n"
" cookie SRV insert indirect nocache\n" " cookie SRV insert indirect nocache\n"
" timeout check 31\n" " timeout check 31s\n"
" option httpchk GET /index.html\n" " option httpchk GET /index.html\n"
" http-check expect rstatus %s\n" " http-check expect rstatus %s\n"
" server sample_member_id_1 10.0.0.99:82 " " server sample_member_id_1 10.0.0.99:82 "
@ -167,7 +167,7 @@ class TestHaproxyCfg(base.BaseTestCase):
" mode tcp\n" " mode tcp\n"
" balance roundrobin\n" " balance roundrobin\n"
" cookie SRV insert indirect nocache\n" " cookie SRV insert indirect nocache\n"
" timeout check 31\n" " timeout check 31s\n"
" option httpchk GET /index.html\n" " option httpchk GET /index.html\n"
" http-check expect rstatus %s\n" " http-check expect rstatus %s\n"
" option ssl-hello-chk\n" " option ssl-hello-chk\n"
@ -258,7 +258,7 @@ class TestHaproxyCfg(base.BaseTestCase):
" balance roundrobin\n" " balance roundrobin\n"
" stick-table type ip size 10k\n" " stick-table type ip size 10k\n"
" stick on src\n" " stick on src\n"
" timeout check 31\n" " timeout check 31s\n"
" option httpchk GET /index.html\n" " option httpchk GET /index.html\n"
" http-check expect rstatus %s\n" " http-check expect rstatus %s\n"
" server sample_member_id_1 10.0.0.99:82 " " server sample_member_id_1 10.0.0.99:82 "
@ -282,7 +282,7 @@ class TestHaproxyCfg(base.BaseTestCase):
" mode http\n" " mode http\n"
" balance roundrobin\n" " balance roundrobin\n"
" appsession APP_COOKIE len 56 timeout 3h\n" " appsession APP_COOKIE len 56 timeout 3h\n"
" timeout check 31\n" " timeout check 31s\n"
" option httpchk GET /index.html\n" " option httpchk GET /index.html\n"
" http-check expect rstatus %s\n" " http-check expect rstatus %s\n"
" server sample_member_id_1 10.0.0.99:82 " " server sample_member_id_1 10.0.0.99:82 "