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

This change makes barbican 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: I7031064b752450bacbb7775c0e357b98210a8929
(cherry picked from commit 6f140b93be8349eddb7e6cd86116ab1b3f34140a)
(cherry picked from commit c996c85caea5ac098c6d57066c144adb05354c49)
(cherry picked from commit 34c96db0e819afc92cf33676010492ba03024371)
---
 .../barbican/barbican-api-container-puppet.yaml   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/deployment/barbican/barbican-api-container-puppet.yaml b/deployment/barbican/barbican-api-container-puppet.yaml
index 988da29453..423b9eea3d 100644
--- a/deployment/barbican/barbican-api-container-puppet.yaml
+++ b/deployment/barbican/barbican-api-container-puppet.yaml
@@ -809,3 +809,18 @@ outputs:
         - null
       metadata_settings:
         get_attr: [ApacheServiceBase, role_data, metadata_settings]
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop barbican api container
+              import_role:
+                name: tripleo_container_stop
+              vars:
+                tripleo_containers_to_stop:
+                  - barbican_api
+                tripleo_delegate_to: "{{ groups['barbican_api'] | default([]) }}"