diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-11 22:34:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-11 22:34:26 +0000 |
| commit | 1a6050e5e5a7dfcd7456a47a352c45ff297a9ffe (patch) | |
| tree | 886e8a96af7c91c5e78e035d41c4723bfd2e8476 /docker | |
| parent | d11b8f260b2f557302ee6c4b69921d5b9c1c6f57 (diff) | |
| parent | bac1235ed200bb7694e286cdc80f689f25f871ef (diff) | |
| download | kolla-1a6050e5e5a7dfcd7456a47a352c45ff297a9ffe.tar.gz kolla-1a6050e5e5a7dfcd7456a47a352c45ff297a9ffe.zip | |
Merge "Clean up horizon httpd pid files for RPM distros"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/extend_start.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 7a0bf9b55..a82821f14 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -5,3 +5,10 @@ if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \ # Loading Apache2 ENV variables 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 |