diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-05 13:33:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-05 13:33:04 +0000 |
| commit | 41f77da4db391decf904fc5f05e12718a32f538a (patch) | |
| tree | dd3cb6230167187c10289cbdebee1b41881dd3f3 | |
| parent | 3d7a0c6f55d5d4db33ff5ecb25466423e5d36b2d (diff) | |
| parent | 7df3a0bea56f654a3d65da27c0e783f775b4ed18 (diff) | |
| download | kolla-41f77da4db391decf904fc5f05e12718a32f538a.tar.gz kolla-41f77da4db391decf904fc5f05e12718a32f538a.zip | |
Merge "Clean up keystone httpd pid files for RPM distros"
| -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 |