From 14df9701b59d2d899b2d0a505d729a9850c62a98 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Thu, 24 Aug 2017 11:03:12 +0800 Subject: 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 --- docker/cloudkitty/cloudkitty-api/extend_start.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'docker/cloudkitty/cloudkitty-api/extend_start.sh') 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 -- cgit v1.2.3