From e2c7e2512a3e2373d4f92ec5bdd8152ce152ff0b Mon Sep 17 00:00:00 2001 From: Martin André Date: Tue, 4 Apr 2017 10:30:24 +0200 Subject: Add missing cleanup step for new apache images A few new images got apache as part of blueprint apache-packages-for-apis without a cleaning up. Without this step the containers may fail to restart due to runtime files already present. This commit fixes it for all images with the exception of heat-base so that it can be cleanly backported to stable/ocata. It also removes the unused APACHE_DIR variable from freezer-api and keystone extend_start.sh script. Change-Id: I47d75221b3d1aae91f11d3e0da83e221a00315b7 Closes-Bug: #1679565 --- docker/cinder/cinder-api/extend_start.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'docker/cinder') diff --git a/docker/cinder/cinder-api/extend_start.sh b/docker/cinder/cinder-api/extend_start.sh index d6709fd59..a92cd0134 100644 --- a/docker/cinder/cinder-api/extend_start.sh +++ b/docker/cinder/cinder-api/extend_start.sh @@ -8,14 +8,15 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then exit 0 fi -if [[ "${KOLLA_INSTALL_TYPE}" == "binary" ]]; then +# Assume the service runs on top of Apache when user is root +if [[ $USER == 'root' ]]; then + # NOTE(pbourke): httpd will not clean up after itself in some cases which + # results in the container not being able to restart. (bug #1489676, 1557036) if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then # Loading Apache2 ENV variables . /etc/apache2/envvars rm -rf /var/run/apache2/* - APACHE_DIR="apache2" else rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd* - APACHE_DIR="httpd" fi fi -- cgit v1.2.3