diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-20 15:36:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-20 15:36:00 +0000 |
| commit | baec569df30695af7b3d64dd3c96a20af7f44132 (patch) | |
| tree | c99b9459f61e284ba5db0a00ae206468c970f2e2 /docker | |
| parent | e3312a58e5d9cd21dbad36fb892172ee3051cd12 (diff) | |
| parent | 3b7e44adeec11b1fec6c28fbf924f8b6cdfab1d3 (diff) | |
| download | kolla-baec569df30695af7b3d64dd3c96a20af7f44132.tar.gz kolla-baec569df30695af7b3d64dd3c96a20af7f44132.zip | |
Merge "Add missing cleanup step for heat images"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/heat/heat-base/extend_start.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/docker/heat/heat-base/extend_start.sh b/docker/heat/heat-base/extend_start.sh index a73f17345..8a11853cd 100644 --- a/docker/heat/heat-base/extend_start.sh +++ b/docker/heat/heat-base/extend_start.sh @@ -7,4 +7,17 @@ if [[ $(stat -c %a /var/log/kolla/heat) != "755" ]]; then chmod 755 /var/log/kolla/heat fi +# Assume the service runs on top of Apache when user is root +if [[ $USER == 'root' ]]; then + # NOTE(pbourke): httpd will not clean up after itself in some cases which + # results in the container not being able to restart. (bug #1489676, 1557036) + if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then + # Loading Apache2 ENV variables + . /etc/apache2/envvars + rm -rf /var/run/apache2/* + else + rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd* + fi +fi + . /usr/local/bin/kolla_heat_extend_start |