From 610eef2089c186c6e698bb1781501ee8c696f7d5 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Fri, 24 Apr 2026 19:25:00 +0200 Subject: Drop apache installation outside of httpd container Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/986483 Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/986352 Change-Id: Ia66dde09bbbad2a5a9e67a8c642f3223ca38be43 Signed-off-by: Michal Nasiadka --- docker/base/Dockerfile.j2 | 3 +-- docker/base/httpd_setup.sh | 51 ---------------------------------------------- 2 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 docker/base/httpd_setup.sh (limited to 'docker/base') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index c137011f6..46d8222c6 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -304,7 +304,6 @@ COPY set_configs.py /usr/local/bin/kolla_set_configs COPY start.sh /usr/local/bin/kolla_start COPY copy_cacerts.sh /usr/local/bin/kolla_copy_cacerts COPY install_projects.sh /usr/local/bin/kolla_install_projects -COPY httpd_setup.sh /usr/local/bin/kolla_httpd_setup COPY kolla_patch.sh /usr/local/bin/kolla_patch COPY sudoers /etc/sudoers @@ -327,7 +326,7 @@ RUN touch /usr/local/bin/kolla_extend_start \ /usr/local/bin/kolla_copy_cacerts \ /usr/local/bin/kolla_install_projects \ /usr/local/bin/kolla_patch \ - && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_httpd_setup \ + && chmod 644 /usr/local/bin/kolla_extend_start \ && chmod 440 /etc/sudoers \ && mkdir -p /var/log/kolla \ && chown :kolla /var/log/kolla \ diff --git a/docker/base/httpd_setup.sh b/docker/base/httpd_setup.sh deleted file mode 100644 index 35f7b5b1e..000000000 --- a/docker/base/httpd_setup.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash - -# This script performs setup necessary to run the Apache httpd web server. -# It should be sourced rather than executed as environment variables are set. - -# Assume the service runs on top of Apache httpd when user is root. -if [[ "$(whoami)" == 'root' ]]; then - # 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 - # NOTE(yoctozepto): APACHE_CONFDIR has to be set to pass the next step - # under the `set -o nounset` regime - APACHE_CONFDIR= - # 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* - # NOTE(mmalchuk): This added to make Rocky/Centos similar to Ubuntu/Debian - # to provide /server-status handler for local monitoring of the Apache. - # The module already loaded in the /etc/httpd/conf.modules.d/00-base.conf. - cat << EOF >/etc/httpd/conf.modules.d/99-server-status.conf - - SetHandler server-status - Require local - -EOF - fi - - # CentOS/Rocky have an issue with mod_ssl which produces an invalid Apache - # configuration in /etc/httpd/conf.d/ssl.conf. This causes the following error - # on startup: - # SSLCertificateFile: file '/etc/pki/tls/certs/localhost.crt' does not exist or is empty - # Work around this by generating certificates manually. - # NOTE(mnasiadka): in EL9 upgrade jobs gencerts is failing on wrong permissions to dhparams.pem - if [[ "${KOLLA_BASE_DISTRO}" =~ centos|rocky ]] && [[ ! -e /etc/pki/tls/certs/localhost.crt ]]; then - rm -f /tmp/dhparams.pem - /usr/libexec/httpd-ssl-gencerts - fi -fi - -# The default system locale with unicode support -LANG=C.UTF-8 - -# Override the default locale if configured -if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then - [ -f /etc/default/locale ] && . /etc/default/locale -else - [ -f /etc/locale.conf ] && . /etc/locale.conf -fi -- cgit v1.2.3