From 065651a3fb06b3d5091541c048fe0def6ec45a66 Mon Sep 17 00:00:00 2001
From: Ha Manh Dong <donghm@vn.fujitsu.com>
Date: Mon, 6 Aug 2018 16:09:06 +0700
Subject: Revert the patch set "Apply Swift rolling upgrade"

Due to there is no way to execute swift graceful shutdown commands
from swift-bootstrap container to swift service containers, so
we need to revert the patch set at [1].

[1] https://review.openstack.org/#/c/560248/

Change-Id: I3363895347c535054584d63e22284c211ca38ad6
---
 docker/swift/swift-proxy-server/Dockerfile.j2   | 3 ---
 docker/swift/swift-proxy-server/extend_start.sh | 8 --------
 docker/swift/swift-rsyncd/extend_start.sh       | 9 ---------
 3 files changed, 20 deletions(-)
 delete mode 100644 docker/swift/swift-proxy-server/extend_start.sh

diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2
index 27a877fe7..4e5aaf4d9 100644
--- a/docker/swift/swift-proxy-server/Dockerfile.j2
+++ b/docker/swift/swift-proxy-server/Dockerfile.j2
@@ -30,9 +30,6 @@ RUN {{ macros.install_pip(swift_proxy_server_pip_packages | customizable("pip_pa
 
 {% endif %}
 
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN chmod 755 /usr/local/bin/kolla_extend_start
-
 {% block swift_proxy_server_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
diff --git a/docker/swift/swift-proxy-server/extend_start.sh b/docker/swift/swift-proxy-server/extend_start.sh
deleted file mode 100644
index 20f0dcae4..000000000
--- a/docker/swift/swift-proxy-server/extend_start.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# Gracefully stop swift proxy and exit if KOLLA_STOP_SERVICES variable is set.
-if [[ "${!KOLLA_STOP_SERVICES[@]}" ]]; then
-    echo "Gracefully Shutdown all Swift proxy processes"
-    swift-init proxy shutdown
-    exit
-fi
diff --git a/docker/swift/swift-rsyncd/extend_start.sh b/docker/swift/swift-rsyncd/extend_start.sh
index 37bc4e012..86d24724b 100644
--- a/docker/swift/swift-rsyncd/extend_start.sh
+++ b/docker/swift/swift-rsyncd/extend_start.sh
@@ -2,12 +2,3 @@
 
 sudo chown -R swift:swift /srv/node
 mkdir -p /var/lib/swift/lock
-
-# Migrate swift database and exit if KOLLA_STOP_SERVICES variable is set.
-if [[ "${!KOLLA_STOP_SERVICES[@]}" ]]; then
-    echo "Stop background Swift jobs"
-    swift-init rest stop
-    echo "Gracefully Shutdown all Swift storage processes"
-    swift-init {account|container|object} shutdown
-    exit
-fi
-- 
cgit v1.2.3