openstack
/
openstack-ansible-haproxy_server
Code Issues Proposed changes

Allow backend and backup node rise/fall parameters to be set 

The template previously set the rise/fall count to the number
of backend/backup nodes. This may not always be appropriate
so this patch allows the rise/fall counts to be defined per
service if required. The default behaviour remains unchanged
if no rise/fall counts are provided.

Change-Id: Ib413b622310b1f6f5146060089af7dffc0dd9236
This commit is contained in:
Jonathan Rosser 2018-12-13 21:49:55 +00:00
parent 4a22e7683b
commit e5104a345c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
templates/service.j2
View File

@ -112,9 +112,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.haproxy_backend_nodes | count | string) %}
{% set _ = entry.append(item.service.backend_rise|default(item.service.haproxy_backend_nodes | count | string)) %}
{% set _ = entry.append("fall") %}
{% set _ = entry.append(item.service.haproxy_backend_nodes | count | string) %}
{% set _ = entry.append(item.service.backend_fall|default(item.service.haproxy_backend_nodes | count | string)) %}
{% if item.service.haproxy_backend_ssl | default(False) %}
{% set _ = entry.append("ssl") %}
{% if item.service.haproxy_backend_ca %}
@ -145,9 +145,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.haproxy_backup_nodes | count | string) %}
{% set _ = entry.append(item.service.backup_rise|default(item.service.haproxy_backup_nodes | count | string)) %}
{% set _ = entry.append("fall") %}
{% set _ = entry.append(item.service.haproxy_backup_nodes | count | string) %}
{% set _ = entry.append(item.service.backup_fall|default(item.service.haproxy_backup_nodes | count | string)) %}
{% set _ = entry.append("backup") %}
{% if item.service.haproxy_backend_ssl | default(False) %}
{% set _ = entry.append("ssl") %}