diff options
| author | Zuul <zuul@review.opendev.org> | 2019-12-16 11:42:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-12-16 11:42:28 +0000 |
| commit | f1eb7a5fd770a656feb44e1de989b2c4da0541a3 (patch) | |
| tree | b3c70babdb55fb737f3a6c4d547afb5c60f58e64 /docker/cloudkitty | |
| parent | 2ee796bdce78aadaeaf42796a4f4dce9e7471ce0 (diff) | |
| parent | 8484190e77e4237247dac7fba128e5a111fc9918 (diff) | |
| download | kolla-f1eb7a5fd770a656feb44e1de989b2c4da0541a3.tar.gz kolla-f1eb7a5fd770a656feb44e1de989b2c4da0541a3.zip | |
Merge "Refactor Apache httpd setup"
Diffstat (limited to 'docker/cloudkitty')
| -rw-r--r-- | docker/cloudkitty/cloudkitty-api/extend_start.sh | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/docker/cloudkitty/cloudkitty-api/extend_start.sh b/docker/cloudkitty/cloudkitty-api/extend_start.sh index e1f41b558..2b144fa3f 100644 --- a/docker/cloudkitty/cloudkitty-api/extend_start.sh +++ b/docker/cloudkitty/cloudkitty-api/extend_start.sh @@ -1,16 +1,5 @@ #!/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 - install -d /var/run/apache2/ - 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 @@ -18,3 +7,5 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then cloudkitty-storage-init exit 0 fi + +. /usr/local/bin/kolla_httpd_setup |