From 07d02af94548ff35a91c62ab9d206f761a1d7b37 Mon Sep 17 00:00:00 2001
From: Gregory Thiemonge <gthiemon@redhat.com>
Date: Mon, 9 Dec 2019 14:43:02 +0100
Subject: [PATCH] Set octavia services' stop grace period to 300sec

Octavia worker, house-keeping and health-monitor serivices may use some
long taskflow's flows to handle load balancers and amphorae (launch VMs,
etc...). Those flows should not be interrupted when restarting those
services (i.e when updating an overcloud, or restarting services because
of certificates rotation), it might cause resource leaks that cannot be
fixed by an admin.

As default container stop timeout is defined to 10 seconds, this timeout
value needs to be increased for octavia services (except octavia api) to
ensure a graceful shutdown.
This new value has been set to 300 seconds according to the octavia
worker default configuration introduced in
https://review.opendev.org/#/c/684201/

Closes-Bug: #1855684
Change-Id: I8911a79328769c910d03168cfa5a421d0dd0f9b6
(cherry picked from commit c595835776eccbc2f59b69574f0aa5c3e87c9bd5)
(cherry picked from commit 011935828040360940130d1402704f3bb68485e9)
---
 docker/services/octavia-health-manager.yaml | 1 +
 docker/services/octavia-housekeeping.yaml   | 1 +
 docker/services/octavia-worker.yaml         | 1 +
 3 files changed, 3 insertions(+)

diff --git a/docker/services/octavia-health-manager.yaml b/docker/services/octavia-health-manager.yaml
index 9006bb18c6..b67012c90c 100644
--- a/docker/services/octavia-health-manager.yaml
+++ b/docker/services/octavia-health-manager.yaml
@@ -119,6 +119,7 @@ outputs:
         step_4:
           octavia_health_manager:
             start_order: 2
+            stop_grace_period: 300
             image: *octavia_health_manager_image
             net: host
             privileged: false
diff --git a/docker/services/octavia-housekeeping.yaml b/docker/services/octavia-housekeeping.yaml
index 4b08afb125..91d4cf84ef 100644
--- a/docker/services/octavia-housekeeping.yaml
+++ b/docker/services/octavia-housekeeping.yaml
@@ -115,6 +115,7 @@ outputs:
         step_4:
           octavia_housekeeping:
             start_order: 2
+            stop_grace_period: 300
             image: *octavia_housekeeping_image
             net: host
             privileged: false
diff --git a/docker/services/octavia-worker.yaml b/docker/services/octavia-worker.yaml
index 61c2542163..b2afda7481 100644
--- a/docker/services/octavia-worker.yaml
+++ b/docker/services/octavia-worker.yaml
@@ -120,6 +120,7 @@ outputs:
         step_4:
           octavia_worker:
             start_order: 2
+            stop_grace_period: 300
             image: *octavia_worker_image
             net: host
             privileged: false