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 --- .../ironic/ironic-prometheus-exporter/Dockerfile.j2 | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'docker/ironic') diff --git a/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 b/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 index 3fdf78167..52a865598 100644 --- a/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 +++ b/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 @@ -9,27 +9,6 @@ USER root {% import "macros.j2" as macros with context %} -{% if base_package_type == 'rpm' %} - - {% set ironic_prometheus_exporter_packages = [ - 'httpd', - 'mod_ssl', - ] %} - -{{ macros.install_packages(ironic_prometheus_exporter_packages | customizable("packages")) }} -RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ - && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf - -{% elif base_package_type == 'deb' %} - {% set ironic_prometheus_exporter_packages = [ - 'apache2', - ] %} - -{{ macros.install_packages(ironic_prometheus_exporter_packages | customizable("packages")) }} -RUN echo > /etc/apache2/ports.conf - -{% endif %} - ENV IRONIC_CONFIG /etc/ironic/ironic.conf {{ macros.kolla_patch_sources() }} -- cgit v1.2.3