diff options
| author | Zuul <zuul@review.openstack.org> | 2018-09-25 09:46:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-09-25 09:46:15 +0000 |
| commit | ffed1a269f4d9855068e02c9627d278482bbe47f (patch) | |
| tree | 9705878f80b4c2391bea1eaf0e332a6a4ac00158 | |
| parent | 28268ceefa0e14ef0456a5bfb65b06136a289a93 (diff) | |
| parent | 065651a3fb06b3d5091541c048fe0def6ec45a66 (diff) | |
| download | kolla-ffed1a269f4d9855068e02c9627d278482bbe47f.tar.gz kolla-ffed1a269f4d9855068e02c9627d278482bbe47f.zip | |
Merge "Revert the patch set "Apply Swift rolling upgrade""
| -rw-r--r-- | docker/swift/swift-proxy-server/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/swift/swift-proxy-server/extend_start.sh | 8 | ||||
| -rw-r--r-- | docker/swift/swift-rsyncd/extend_start.sh | 9 |
3 files changed, 0 insertions, 20 deletions
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 |