From 6ef631d229eb545246776c0618573daefc8f85bc Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 10 Dec 2019 11:51:51 +0000 Subject: 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 (cherry picked from commit 8484190e77e4237247dac7fba128e5a111fc9918) --- docker/monasca/monasca-api/extend_start.sh | 13 ++----------- docker/monasca/monasca-log-api/extend_start.sh | 13 ++----------- 2 files changed, 4 insertions(+), 22 deletions(-) (limited to 'docker/monasca') diff --git a/docker/monasca/monasca-api/extend_start.sh b/docker/monasca/monasca-api/extend_start.sh index f52868035..7f5802f15 100644 --- a/docker/monasca/monasca-api/extend_start.sh +++ b/docker/monasca/monasca-api/extend_start.sh @@ -9,17 +9,6 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then exit 0 fi -# 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 - # When Apache first starts it writes out the custom log files with root # ownership. This later prevents the Monasca API (which runs under the # 'monasca' user) from updating them. To avoid this we create the log @@ -33,3 +22,5 @@ for LOG_TYPE in error access; do chown monasca:kolla ${MONASCA_API_LOG_DIR}/${SERVICE}-${LOG_TYPE}.log fi done + +. /usr/local/bin/kolla_httpd_setup diff --git a/docker/monasca/monasca-log-api/extend_start.sh b/docker/monasca/monasca-log-api/extend_start.sh index d343ab26a..088ce5de1 100644 --- a/docker/monasca/monasca-log-api/extend_start.sh +++ b/docker/monasca/monasca-log-api/extend_start.sh @@ -2,17 +2,6 @@ SERVICE="monasca-log-api" -# 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 - # When Apache first starts it writes out the custom log files with root # ownership. This later prevents the Monasca Log API (which runs under the # 'monasca' user) from updating them. To avoid this we create the log @@ -26,3 +15,5 @@ for LOG_TYPE in error access; do chown monasca:kolla ${MONASCA_LOG_API_LOG_DIR}/${SERVICE}-${LOG_TYPE}.log fi done + +. /usr/local/bin/kolla_httpd_setup -- cgit v1.2.3