openstack/octavia
Code Issues Proposed changes

Merge "Update haproxy logging configuration"

Browse Source
This commit is contained in:
Jenkins 2016-10-15 15:06:38 +00:00 committed by Gerrit Code Review
commit 9ccbe5b605
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/etc/octavia/haproxy.cfg
View File

@ -14,7 +14,7 @@ defaults
frontend octavia-frontend-api frontend octavia-frontend-api
option tcplog option httplog
bind 0.0.0.0:OCTAVIA_PORT bind 0.0.0.0:OCTAVIA_PORT
mode http mode http
default_backend octavia-backend-api default_backend octavia-backend-api
@ -26,4 +26,4 @@ backend octavia-backend-api
# the devstack plugin will add entries here looking like: # the devstack plugin will add entries here looking like:
# server octavia-main <IP-main>:<PORT> weight 1 # server octavia-main <IP-main>:<PORT> weight 1
# server octavia-second <IP-second>:<PORT> weight 1 # server octavia-second <IP-second>:<PORT> weight 1
# #

7
octavia/common/jinja/haproxy/templates/macros.j2
View File

@ -112,7 +112,14 @@ bind {{ lb_vip_address }}:{{ listener.protocol_port }} {{
{% macro frontend_macro(constants, listener, lb_vip_address) %} {% macro frontend_macro(constants, listener, lb_vip_address) %}
frontend {{ listener.id }} frontend {{ listener.id }}
{% if (listener.protocol.lower() ==
constants.PROTOCOL_TERMINATED_HTTPS.lower() or
listener.protocol.lower() ==
constants.PROTOCOL_HTTP.lower()) %}
option httplog
{% else %}
option tcplog option tcplog
{% endif %}
{% if listener.connection_limit is defined %} {% if listener.connection_limit is defined %}
maxconn {{ listener.connection_limit }} maxconn {{ listener.connection_limit }}
{% endif %} {% endif %}

6
octavia/tests/unit/common/jinja/haproxy/test_jinja_cfg.py
View File

@ -31,7 +31,7 @@ class TestHaproxyCfg(base.TestCase):
def test_render_template_tls(self): def test_render_template_tls(self):
fe = ("frontend sample_listener_id_1\n" fe = ("frontend sample_listener_id_1\n"
" option tcplog\n" " option httplog\n"
" maxconn 98\n" " maxconn 98\n"
" redirect scheme https if !{ ssl_fc }\n" " redirect scheme https if !{ ssl_fc }\n"
" bind 10.0.0.2:443 " " bind 10.0.0.2:443 "
@ -69,7 +69,7 @@ class TestHaproxyCfg(base.TestCase):
def test_render_template_tls_no_sni(self): def test_render_template_tls_no_sni(self):
fe = ("frontend sample_listener_id_1\n" fe = ("frontend sample_listener_id_1\n"
" option tcplog\n" " option httplog\n"
" maxconn 98\n" " maxconn 98\n"
" redirect scheme https if !{ ssl_fc }\n" " redirect scheme https if !{ ssl_fc }\n"
" bind 10.0.0.2:443 " " bind 10.0.0.2:443 "
@ -274,7 +274,7 @@ class TestHaproxyCfg(base.TestCase):
def test_render_template_l7policies(self): def test_render_template_l7policies(self):
fe = ("frontend sample_listener_id_1\n" fe = ("frontend sample_listener_id_1\n"
" option tcplog\n" " option httplog\n"
" maxconn 98\n" " maxconn 98\n"
" bind 10.0.0.2:80\n" " bind 10.0.0.2:80\n"
" mode http\n" " mode http\n"

2
octavia/tests/unit/common/sample_configs/sample_configs.py
View File

@ -635,7 +635,7 @@ def sample_l7rule_tuple(id,
def sample_base_expected_config(frontend=None, backend=None, peers=None): def sample_base_expected_config(frontend=None, backend=None, peers=None):
if frontend is None: if frontend is None:
frontend = ("frontend sample_listener_id_1\n" frontend = ("frontend sample_listener_id_1\n"
" option tcplog\n" " option httplog\n"
" maxconn 98\n" " maxconn 98\n"
" bind 10.0.0.2:80\n" " bind 10.0.0.2:80\n"
" mode http\n" " mode http\n"