openstack
/
openstack-ansible-haproxy_server
Code Issues Proposed changes

Make use of haproxy_rise and haproxy_fall variables 

At the moment for some reason we're not taking into account default
variables haproxy_rise/haproxy_fall but instead trying to count
based on amount of backends. This makes quite little sense to
depend amount of backend rechecks on amount of backends overall,
so we're chaning behaviour to pre-defined variables that already exist.

Change-Id: I1e53a997f6f443718ea2c6bdfbe8a0b98c44896d
(cherry picked from commit 6532898a3c)
This commit is contained in:
Dmitriy Rabotyagov 2022-12-09 15:44:29 +01:00 committed by Christian Rohmann
parent a2cc97a67a
commit 9270ca48cd
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
releasenotes/notes/haproxy_rise_fall-64ba2e6d7e206973.yaml Normal file
View File

@ -0,0 +1,8 @@
---
fixes:
- |
Variables ``haproxy_fall`` and ``haproxy_rise`` are now respected again
and will be used for defining amount of checks before haproxy will mark
backend as UP or DOWN. Keys ``backend_rise`` and ``haproxy_fall`` that are
set inside service definition are still respected and will have
prescedence over global ones.

12
templates/service.j2
View File

@ -128,9 +128,9 @@ backend {{ item.service.haproxy_service_name }}-back
{% set _ = entry.append("inter") %}
{% set _ = entry.append(item.service.interval|default(haproxy_interval) | string) %}
{% set _ = entry.append("rise") %}
{% set _ = entry.append(item.service.backend_rise|default(item.service.haproxy_backend_nodes | count | string)) %}
{% set _ = entry.append(item.service.backend_rise|default(haproxy_rise | string)) %}
{% set _ = entry.append("fall") %}
{% set _ = entry.append(item.service.backend_fall|default(item.service.haproxy_backend_nodes | count | string)) %}
{% set _ = entry.append(item.service.backend_fall|default(haproxy_fall | string)) %}
{% if item.service.haproxy_backend_ssl | default(False) %}
{% set _ = entry.append("ssl") %}
{% if item.service.haproxy_backend_ssl_check | default(item.service.haproxy_backend_ssl) %}
@ -165,9 +165,9 @@ backend {{ item.service.haproxy_service_name }}-back
{% set _ = entry.append("inter") %}
{% set _ = entry.append(item.service.interval|default(haproxy_interval) | string) %}
{% set _ = entry.append("rise") %}
{% set _ = entry.append(item.service.backend_rise|default(item.service.haproxy_backend_nodes | count | string)) %}
{% set _ = entry.append(item.service.backend_rise|default(haproxy_rise | string)) %}
{% set _ = entry.append("fall") %}
{% set _ = entry.append(item.service.backend_fall|default(item.service.haproxy_backend_nodes | count | string)) %}
{% set _ = entry.append(item.service.backend_fall|default(haproxy_fall | string)) %}
{% set backend_server_options = item.service.haproxy_backend_server_options|default([]) %}
{% for option in backend_server_options %}
{% set _ = entry.append(option) %}
@ -194,9 +194,9 @@ backend {{ item.service.haproxy_service_name }}-back
{% set _ = entry.append("inter") %}
{% set _ = entry.append(haproxy_interval | string) %}
{% set _ = entry.append("rise") %}
{% set _ = entry.append(item.service.backup_rise|default(item.service.haproxy_backup_nodes | count | string)) %}
{% set _ = entry.append(item.service.backup_rise|default(haproxy_rise | string)) %}
{% set _ = entry.append("fall") %}
{% set _ = entry.append(item.service.backup_fall|default(item.service.haproxy_backup_nodes | count | string)) %}
{% set _ = entry.append(item.service.backup_fall|default(haproxy_fall | string)) %}
{% set _ = entry.append("backup") %}
{% if item.service.haproxy_backend_ssl | default(False) %}
{% set _ = entry.append("ssl") %}