diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2015-11-05 11:46:14 +0000 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2015-11-05 11:46:14 +0000 |
| commit | 7df3a0bea56f654a3d65da27c0e783f775b4ed18 (patch) | |
| tree | 0f57700772e99cdeffb60eb8400490c480dcc38e /docker | |
| parent | 4beea51e75c1a3c8348f58101ea62528187b597b (diff) | |
| download | kolla-7df3a0bea56f654a3d65da27c0e783f775b4ed18.tar.gz kolla-7df3a0bea56f654a3d65da27c0e783f775b4ed18.zip | |
Clean up keystone httpd pid files for RPM distros
In some cases we're seeing httpd not cleaning up properly after itself,
which results in the keystone container failing to restart. This is
confirmed to happen on rpm based distros, but have not had any reports
on Ubuntu.
Change-Id: I58b006189e700f1c851601b4f64dd0fae931103c
Closes-Bug: #1489676
Co-Authored-By: Tim Potter <tpot@hpe.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/keystone/extend_start.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docker/keystone/extend_start.sh b/docker/keystone/extend_start.sh index b1a6d334b..c7c8ad83d 100644 --- a/docker/keystone/extend_start.sh +++ b/docker/keystone/extend_start.sh @@ -6,6 +6,13 @@ if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \ source /etc/apache2/envvars 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 # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then |