openstack
/
kolla
Code Issues Proposed changes

Add missing cleanup step for heat images 

The heat 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.

Change-Id: I55a7144caa913117f71100f757b1e601de6471a6
Closes-Bug: #1679565
This commit is contained in:
Martin André 2017-04-04 10:39:56 +02:00
parent e2c7e2512a
commit 3b7e44adee
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docker/heat/heat-base/extend_start.sh
View File

@ -7,4 +7,17 @@ if [[ $(stat -c %a /var/log/kolla/heat) != "755" ]]; then
chmod 755 /var/log/kolla/heat
fi
# 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/*
else
rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*
fi
fi
. /usr/local/bin/kolla_heat_extend_start