From 8fc59c12c9594c62ee6e40f8e8b606cd7efb818f Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sat, 5 Sep 2020 18:18:55 +0900
Subject: [PATCH] Stop octavia servics in unupgraded controllers

This change makes octavia services on unupgrade controller nodes get
stopped, because all services in the unupgrade controllers should be
stopped before we start the upgraded controller[1].

[1] 8529ce60da84d2aa1e1c9e6994303678261b09da

Change-Id: I51855841c269ec593933288af4135f5d06a139fe
(cherry picked from commit b3d7836952404bf989507c908f46217a1996939a)
(cherry picked from commit bbf25f9377b603511dee3e3e9bc3f4fbda998266)
(cherry picked from commit 9740d89f15da279f239eea4a7e81ac762200a5e9)
---
 .../octavia/octavia-api-container-puppet.yaml     | 15 +++++++++++++++
 .../octavia-health-manager-container-puppet.yaml  | 15 +++++++++++++++
 .../octavia-housekeeping-container-puppet.yaml    | 15 +++++++++++++++
 .../octavia/octavia-worker-container-puppet.yaml  | 15 +++++++++++++++
 4 files changed, 60 insertions(+)

diff --git a/deployment/octavia/octavia-api-container-puppet.yaml b/deployment/octavia/octavia-api-container-puppet.yaml
index 72ea402868..b96d19d114 100644
--- a/deployment/octavia/octavia-api-container-puppet.yaml
+++ b/deployment/octavia/octavia-api-container-puppet.yaml
@@ -445,3 +445,18 @@ outputs:
             - step|int == 2
             - internal_tls_enabled|bool
           block: *remove_octavia_tls_proxy_tasks
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop octavia api container
+              import_role:
+                name: tripleo_container_stop
+              vars:
+                tripleo_containers_to_stop:
+                  - octavia_api
+                tripleo_delegate_to: "{{ groups['octavia_api'] | default([]) }}"
diff --git a/deployment/octavia/octavia-health-manager-container-puppet.yaml b/deployment/octavia/octavia-health-manager-container-puppet.yaml
index d6a95c23e6..6220c9eae3 100644
--- a/deployment/octavia/octavia-health-manager-container-puppet.yaml
+++ b/deployment/octavia/octavia-health-manager-container-puppet.yaml
@@ -206,3 +206,18 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/octavia, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
             - { 'path': /var/log/containers/octavia-amphorae, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop octavia health manager container
+              import_role:
+                name: tripleo_container_stop
+              vars:
+                tripleo_containers_to_stop:
+                  - octavia_health_manager
+                tripleo_delegate_to: "{{ groups['octavia_health_manager'] | default([]) }}"
diff --git a/deployment/octavia/octavia-housekeeping-container-puppet.yaml b/deployment/octavia/octavia-housekeeping-container-puppet.yaml
index 2ad7492214..f222b6a635 100644
--- a/deployment/octavia/octavia-housekeeping-container-puppet.yaml
+++ b/deployment/octavia/octavia-housekeeping-container-puppet.yaml
@@ -157,3 +157,18 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/octavia, 'setype': svirt_sandbox_file_t, 'mode': '0750' }
       upgrade_tasks: []
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop octavia housekeeping container
+              import_role:
+                name: tripleo_container_stop
+              vars:
+                tripleo_containers_to_stop:
+                  - octavia_housekeeping
+                tripleo_delegate_to: "{{ groups['octavia_housekeeping'] | default([]) }}"
diff --git a/deployment/octavia/octavia-worker-container-puppet.yaml b/deployment/octavia/octavia-worker-container-puppet.yaml
index 3c0aed1800..27354153c1 100644
--- a/deployment/octavia/octavia-worker-container-puppet.yaml
+++ b/deployment/octavia/octavia-worker-container-puppet.yaml
@@ -168,3 +168,18 @@ outputs:
             persistent: yes
             state: yes
       upgrade_tasks: []
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop octavia api container
+              import_role:
+                name: tripleo_container_stop
+              vars:
+                tripleo_containers_to_stop:
+                  - octavia_worker
+                tripleo_delegate_to: "{{ groups['octavia_worker'] | default([]) }}"