From c8b424ea0dc52168389bee8a473cec2cf23952de Mon Sep 17 00:00:00 2001
From: Jose Luis Franco Arza <jfrancoa@redhat.com>
Date: Fri, 4 Sep 2020 16:54:54 +0200
Subject: [PATCH] [Train only] Add missing stop service steps for FFU.

We observed, when running the system_upgrade_transfer_data that few OSP
services which are still present in Train keep running before the database
backup is restored on the newly upgraded controller. This could cause some
discrepancies between the restored state and the cluster one.

Adding all the identified services present in both versions (deprecated
services will be stopped when upgrading the old nodes operating system).

Change-Id: I43e0d04866f6ce37be5de8b68aac6d43e165dc76
Closes-Bug: #1894238
---
 .../swift/swift-proxy-container-puppet.yaml       | 15 +++++++++++++++
 .../swift/swift-ringbuilder-container-puppet.yaml | 15 +++++++++++++++
 .../swift/swift-storage-container-puppet.yaml     | 15 +++++++++++++++
 3 files changed, 45 insertions(+)

diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml
index 4e378a0820..d40fb83572 100644
--- a/deployment/swift/swift-proxy-container-puppet.yaml
+++ b/deployment/swift/swift-proxy-container-puppet.yaml
@@ -479,3 +479,18 @@ outputs:
           when: swift_log_link.stat.islnk is defined and swift_log_link.stat.islnk
       metadata_settings:
         get_attr: [TLSProxyBase, role_data, metadata_settings]
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop swift-proxy container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - swift-proxy
+                tripleo_delegate_to: "{{ groups['swift_proxy'] | default([]) }}"
diff --git a/deployment/swift/swift-ringbuilder-container-puppet.yaml b/deployment/swift/swift-ringbuilder-container-puppet.yaml
index 918e0a8bfe..206a09c185 100644
--- a/deployment/swift/swift-ringbuilder-container-puppet.yaml
+++ b/deployment/swift/swift-ringbuilder-container-puppet.yaml
@@ -124,3 +124,18 @@ outputs:
             volumes:
               - /var/lib/config-data/puppet-generated/swift/etc/swift:/etc/swift:rw,z
               - /var/lib/config-data/swift_ringbuilder:/swift_ringbuilder:ro
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop swift-ringbuilder container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - swift-ringbuilder
+                tripleo_delegate_to: "{{ groups['swift_ringbuilder'] | default([]) }}"
diff --git a/deployment/swift/swift-storage-container-puppet.yaml b/deployment/swift/swift-storage-container-puppet.yaml
index ae63bc63ec..ea5cdd55fc 100644
--- a/deployment/swift/swift-storage-container-puppet.yaml
+++ b/deployment/swift/swift-storage-container-puppet.yaml
@@ -686,3 +686,18 @@ outputs:
             path: /var/log/containers/swift
             state: absent
           when: swift_log_link.stat.islnk is defined and swift_log_link.stat.islnk
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop swift-storage container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - swift-storage
+                tripleo_delegate_to: "{{ groups['swift_storage'] | default([]) }}"