diff options
| author | Mark Goddard <mark@stackhpc.com> | 2019-12-10 11:51:51 +0000 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-01-14 13:16:38 +0000 |
| commit | 6ef631d229eb545246776c0618573daefc8f85bc (patch) | |
| tree | 73a55d728517ec7069fb26de632b719668afeec1 /docker/horizon | |
| parent | 902f16cb1a8efc44da8669a6707d93d47160ae9d (diff) | |
| download | kolla-6ef631d229eb545246776c0618573daefc8f85bc.tar.gz kolla-6ef631d229eb545246776c0618573daefc8f85bc.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
(cherry picked from commit 8484190e77e4237247dac7fba128e5a111fc9918)
Diffstat (limited to 'docker/horizon')
| -rw-r--r-- | docker/horizon/extend_start.sh | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index a2bc79e13..a03ad5872 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -355,21 +355,6 @@ config_watcher_dashboard config_zaqar_dashboard config_zun_dashboard -# 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/ - if [[ "${KOLLA_BASE_DISTRO}" == "debian" ]] && [[ ${KOLLA_INSTALL_TYPE} == "binary" ]]; then - APACHE_RUN_GROUP=horizon - APACHE_RUN_USER=horizon - fi - rm -rf /var/run/apache2/* -else - rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd* -fi - if settings_changed; then ${MANAGE_PY} collectstatic --noinput --clear ${MANAGE_PY} compress --force @@ -389,3 +374,10 @@ fi if [[ -f ${SITE_PACKAGES}/openstack_dashboard/local/.secret_key_store ]] && [[ $(stat -c %U ${SITE_PACKAGES}/openstack_dashboard/local/.secret_key_store) != "horizon" ]]; then chown horizon ${SITE_PACKAGES}/openstack_dashboard/local/.secret_key_store fi + +. /usr/local/bin/kolla_httpd_setup + +if [[ "${KOLLA_BASE_DISTRO}" == "debian" ]] && [[ ${KOLLA_INSTALL_TYPE} == "binary" ]]; then + APACHE_RUN_GROUP=horizon + APACHE_RUN_USER=horizon +fi |