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/keystone/keystone/extend_start.sh | 2 -- 1 file changed, 2 deletions(-) (limited to 'docker/keystone') diff --git a/docker/keystone/keystone/extend_start.sh b/docker/keystone/keystone/extend_start.sh index b29bf02a3..cd8a75635 100644 --- a/docker/keystone/keystone/extend_start.sh +++ b/docker/keystone/keystone/extend_start.sh @@ -17,10 +17,8 @@ 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 # Create log dir for Keystone logs -- cgit v1.2.3