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/horizon | |
| parent | 2ee796bdce78aadaeaf42796a4f4dce9e7471ce0 (diff) | |
| parent | 8484190e77e4237247dac7fba128e5a111fc9918 (diff) | |
| download | kolla-f1eb7a5fd770a656feb44e1de989b2c4da0541a3.tar.gz kolla-f1eb7a5fd770a656feb44e1de989b2c4da0541a3.zip | |
Merge "Refactor Apache httpd setup"
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 |