diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-09-01 09:27:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-09-01 09:27:47 +0000 |
| commit | 04aa1add96581a8e1e1a97ce677ffec4febc2309 (patch) | |
| tree | fb5b61cf7e6e2e259b6d52b1e9bf4fbfdc00bd56 /docker/cloudkitty/cloudkitty-api/extend_start.sh | |
| parent | 0218697d00e183c069280fe386f498d3dc472868 (diff) | |
| parent | 14df9701b59d2d899b2d0a505d729a9850c62a98 (diff) | |
| download | kolla-04aa1add96581a8e1e1a97ce677ffec4febc2309.tar.gz kolla-04aa1add96581a8e1e1a97ce677ffec4febc2309.zip | |
Merge "Add WSGI support for cloudkitty-api"
Diffstat (limited to 'docker/cloudkitty/cloudkitty-api/extend_start.sh')
| -rw-r--r-- | docker/cloudkitty/cloudkitty-api/extend_start.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/docker/cloudkitty/cloudkitty-api/extend_start.sh b/docker/cloudkitty/cloudkitty-api/extend_start.sh index 26d4a8c36..756fd82fd 100644 --- a/docker/cloudkitty/cloudkitty-api/extend_start.sh +++ b/docker/cloudkitty/cloudkitty-api/extend_start.sh @@ -1,5 +1,15 @@ #!/bin/bash +# 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 + # 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 |