diff options
| author | ZhongShengping <chdzsp@163.com> | 2017-08-24 11:03:12 +0800 |
|---|---|---|
| committer | ZhongShengping <chdzsp@163.com> | 2017-08-31 08:50:39 +0800 |
| commit | 14df9701b59d2d899b2d0a505d729a9850c62a98 (patch) | |
| tree | e7b7aa4fe8d7e1a0011d351df69ca892415185a9 /docker/cloudkitty/cloudkitty-api/extend_start.sh | |
| parent | 7b3e9c595cd5a3d838ba6178711356f45e4e5f25 (diff) | |
| download | kolla-14df9701b59d2d899b2d0a505d729a9850c62a98.tar.gz kolla-14df9701b59d2d899b2d0a505d729a9850c62a98.zip | |
Add WSGI support for cloudkitty-api
They dropped the cloudkitty-api command line[0], so we should add wsgi
support for cloudkitty-api.
[0]https://review.openstack.org/#/c/366043/
Change-Id: Ie6a08831f8c0bcf3051f01fccc9e3662f36b03ca
Closes-Bug: #1713879
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 |