Clean up horizon httpd pid files for RPM distros

(apply same fix that we did for keystone, to horizon)

In some cases we're seeing httpd not cleaning up properly after itself,
which results in the horizon container failing to restart. This is
confirmed to happen on rpm based distros, but have not had any reports
on Ubuntu.

Change-Id: I8ece6da1a8a1180730d68be0d129a656ddcede07
Closes-Bug: #1515214
backport: liberty
This commit is contained in:
Paul Bourke 2015-11-11 11:11:44 +00:00
parent 3768a54ed7
commit bac1235ed2

View File

@ -5,3 +5,10 @@ if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \
# Loading Apache2 ENV variables # Loading Apache2 ENV variables
source /etc/apache2/envvars source /etc/apache2/envvars
fi fi
# NOTE(pbourke): httpd will not clean up after itself in some cases which
# results in the container not being able to restart. Unconfirmed if this
# happens on Ubuntu. (bug #1489676)
if [[ "${KOLLA_BASE_DISTRO}" =~ fedora|centos|oraclelinux|rhel ]]; then
rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*
fi