diff options
| author | Martin André <m.andre@redhat.com> | 2017-04-04 10:39:56 +0200 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2017-04-20 10:17:58 +0200 |
| commit | 3b7e44adeec11b1fec6c28fbf924f8b6cdfab1d3 (patch) | |
| tree | 06630bd4ceb58586a1d780a545f836e4cc1ce39a /docker | |
| parent | e2c7e2512a3e2373d4f92ec5bdd8152ce152ff0b (diff) | |
| download | kolla-3b7e44adeec11b1fec6c28fbf924f8b6cdfab1d3.tar.gz kolla-3b7e44adeec11b1fec6c28fbf924f8b6cdfab1d3.zip | |
Add missing cleanup step for heat images
The heat images got apache as part of blueprint
apache-packages-for-apis without a cleaning up. Without this step the
containers may fail to restart due to runtime files already present.
Change-Id: I55a7144caa913117f71100f757b1e601de6471a6
Closes-Bug: #1679565
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 |