diff options
| author | Mark Goddard <mark@stackhpc.com> | 2019-12-10 11:51:51 +0000 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2019-12-11 11:38:46 +0000 |
| commit | 8484190e77e4237247dac7fba128e5a111fc9918 (patch) | |
| tree | 8c34211aa6fc258e4011f2f09890632cf2df3187 /docker/cloudkitty/cloudkitty-api/extend_start.sh | |
| parent | 53683598354b2f5ba7bdba47a02b382404ad3de3 (diff) | |
| download | kolla-8484190e77e4237247dac7fba128e5a111fc9918.tar.gz kolla-8484190e77e4237247dac7fba128e5a111fc9918.zip | |
Refactor Apache httpd setup
All Apache httpd setup has been moved to a new helper script,
kolla_httpd_setup. This includes the existing clean of /run/httpd,
/var/run/httpd, /tmp/httpd etc.
Horizon has an additional bit of Apache config for Debian/binary, which
has been kept in extend_start.sh for horizon.
Change-Id: Ia2af74b69c151db0bd7e452460b0babcee50b282
Related: blueprint centos-rhel-8
Diffstat (limited to 'docker/cloudkitty/cloudkitty-api/extend_start.sh')
| -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 |