openstack/kolla-ansible
Code Issues Proposed changes

Merge "Clean up keystone httpd pid files for RPM distros"

Browse Source
This commit is contained in:
Jenkins 2015-11-05 13:33:04 +00:00 committed by Gerrit Code Review
commit 41f77da4db
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/keystone/extend_start.sh
View File

@ -6,6 +6,13 @@ if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \
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
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
# of the KOLLA_BOOTSTRAP variable being set, including empty. # of the KOLLA_BOOTSTRAP variable being set, including empty.
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then