From e5104a345c1631682e7d3eb89a7f77225e7bf555 Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Thu, 13 Dec 2018 21:49:55 +0000
Subject: [PATCH] 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
---
 templates/service.j2 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/service.j2 b/templates/service.j2
index b33305e..3524adc 100644
--- a/templates/service.j2
+++ b/templates/service.j2
@@ -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") %}