openstack
/
octavia
Code Issues Proposed changes

Merge "Fix disabled UDP pools" into stable/victoria

This commit is contained in:
Zuul 2022-11-17 15:11:31 +00:00 committed by Gerrit Code Review
parent 066a644fc5 a8fb6a37be
commit f34ddb77d5
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
octavia/common/jinja/lvs/templates/macros.j2
View File

@ -123,9 +123,11 @@ virtual_server {{ lb_vip_address }} {{ listener.protocol_port }} {
{% if default_pool.health_monitor and default_pool.health_monitor.enabled %}
# Configuration for HealthMonitor {{ default_pool.health_monitor.id }}
{% endif %}
{% for member in default_pool.members %}
{% if default_pool.enabled %}
{% for member in default_pool.members %}
{{- realserver_macro(constants, default_pool, member, listener) }}
{% endfor %}
{% endfor %}
{% endif %}
{% endif %}
}
{% endif %}

8
octavia/tests/unit/common/jinja/lvs/test_lvs_jinja_cfg.py
View File

@ -249,14 +249,6 @@ class TestLvsCfg(base.TestCase):
" lb_kind NAT\n"
" protocol UDP\n\n\n"
" # Pool sample_pool_id_1 is disabled\n"
" # Configuration for Member sample_member_id_1\n"
" real_server 10.0.0.99 82 {\n"
" weight 13\n\n"
" }\n\n"
" # Configuration for Member sample_member_id_2\n"
" real_server 10.0.0.98 82 {\n"
" weight 13\n\n"
" }\n\n"
"}\n\n")
rendered_obj = self.udp_jinja_cfg.render_loadbalancer_obj(

5
releasenotes/notes/fix-disabled-udp-pool-3e84558f996017d5.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fix disabled UDP pools. Disabled UDP pools were marked as "OFFLINE" but the
requests were still forwarded to the members of the pool.