From 9174cf8597fd9488dd3a2adfe7461a12fdc5b9c0 Mon Sep 17 00:00:00 2001
From: Christian Schwede <cschwede@redhat.com>
Date: Wed, 17 Oct 2018 14:15:22 +0200
Subject: [PATCH] Disable non-containerized Swift services

Some services were not disabled after upgrading to a containerized
undercloud. This patch fixes this.

Closes-Bug: 1798366

Change-Id: Ifa8a135426c60e0f9fb3c4b2b6e63fde02f23bfb
---
 docker/services/swift-storage.yaml                           | 4 ++++
 ...le-non-containerized-swift-services-4f7edd98203d749b.yaml | 5 +++++
 2 files changed, 9 insertions(+)
 create mode 100644 releasenotes/notes/disable-non-containerized-swift-services-4f7edd98203d749b.yaml

diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml
index 40007d3622..eedb360631 100644
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@ -522,10 +522,12 @@ outputs:
                 - openstack-swift-container-replicator
                 - openstack-swift-container-updater
                 - openstack-swift-container
+                - openstack-swift-container-sync
                 - openstack-swift-object-auditor
                 - openstack-swift-object-replicator
                 - openstack-swift-object-updater
                 - openstack-swift-object
+                - openstack-swift-object-reconstructor
             - name: Set fact swift_services_enabled
               set_fact:
                 swift_services_enabled: "{{ swift_services_enabled_result }}"
@@ -580,10 +582,12 @@ outputs:
                 - openstack-swift-container-replicator
                 - openstack-swift-container-updater
                 - openstack-swift-container
+                - openstack-swift-container-sync
                 - openstack-swift-object-auditor
                 - openstack-swift-object-replicator
                 - openstack-swift-object-updater
                 - openstack-swift-object
+                - openstack-swift-object-reconstructor
               ignore_errors: True
               register: swift_services_enabled_result
             - name: Set fact swift_services_enabled
diff --git a/releasenotes/notes/disable-non-containerized-swift-services-4f7edd98203d749b.yaml b/releasenotes/notes/disable-non-containerized-swift-services-4f7edd98203d749b.yaml
new file mode 100644
index 0000000000..dbb2b8f6d1
--- /dev/null
+++ b/releasenotes/notes/disable-non-containerized-swift-services-4f7edd98203d749b.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Make sure all Swift services are disabled after upgrading to a
+    containerized undercloud.