From 929df04f10273cbbdae0bd1cc75f24f49963bc83 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 28 Apr 2026 09:28:31 +0200 Subject: Remove httpd_setup calls from api containers We have dropped mod_wsgi support from services in [1]. [1]: https://review.opendev.org/c/openstack/kolla-ansible/+/982414 Change-Id: Ie5da8427706dfb74bad4e174c990355a6870114c Signed-off-by: Michal Nasiadka --- docker/ironic/ironic-api/extend_start.sh | 2 -- docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 | 3 --- docker/ironic/ironic-prometheus-exporter/extend_start.sh | 3 --- 3 files changed, 8 deletions(-) delete mode 100644 docker/ironic/ironic-prometheus-exporter/extend_start.sh (limited to 'docker/ironic') diff --git a/docker/ironic/ironic-api/extend_start.sh b/docker/ironic/ironic-api/extend_start.sh index b03feb65d..ce2f7fb3e 100644 --- a/docker/ironic/ironic-api/extend_start.sh +++ b/docker/ironic/ironic-api/extend_start.sh @@ -17,5 +17,3 @@ if [[ "${!KOLLA_OSM[@]}" ]]; then ironic-dbsync online_data_migrations exit 0 fi - -. /usr/local/bin/kolla_httpd_setup diff --git a/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 b/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 index 09ab2b7fc..3fdf78167 100644 --- a/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 +++ b/docker/ironic/ironic-prometheus-exporter/Dockerfile.j2 @@ -32,9 +32,6 @@ RUN echo > /etc/apache2/ports.conf ENV IRONIC_CONFIG /etc/ironic/ironic.conf -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start - {{ macros.kolla_patch_sources() }} {% block ironic_prometheus_exporter_footer %}{% endblock %} diff --git a/docker/ironic/ironic-prometheus-exporter/extend_start.sh b/docker/ironic/ironic-prometheus-exporter/extend_start.sh deleted file mode 100644 index c55f0b199..000000000 --- a/docker/ironic/ironic-prometheus-exporter/extend_start.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -. /usr/local/bin/kolla_httpd_setup -- cgit v1.2.3