From 88b659d9886fb04749e2c4e43bb6b0ddbe786576 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Thu, 18 Jun 2026 10:01:34 +0200 Subject: Remove cgi-bin creation in gnocchi and masakari This is no longer required Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/993932 Change-Id: I20a2ff0a97b9fad86b6103ec488a39e42cdba091 Signed-off-by: Michal Nasiadka --- docker/gnocchi/gnocchi-base/Dockerfile.j2 | 1 - docker/masakari/masakari-base/Dockerfile.j2 | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index b4a210a13..a050bce8d 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -18,7 +18,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python3-rados', ] %} -RUN mkdir -p /var/www/cgi-bin/gnocchi {% elif base_package_type == 'deb' %} {% set gnocchi_base_packages = [ diff --git a/docker/masakari/masakari-base/Dockerfile.j2 b/docker/masakari/masakari-base/Dockerfile.j2 index 9b5e117bc..7ec23e4e1 100644 --- a/docker/masakari/masakari-base/Dockerfile.j2 +++ b/docker/masakari/masakari-base/Dockerfile.j2 @@ -33,9 +33,8 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN ln -s masakari-base-source/* masakari \ && {{ macros.install_pip(masakari_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/masakari /var/www/cgi-bin/masakari \ + && mkdir -p /etc/masakari \ && cp -r /masakari/etc/masakari/* /etc/masakari/ \ - && chmod 755 /var/www/cgi-bin/masakari \ && touch /usr/local/bin/kolla_masakari_extend_start \ && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_masakari_extend_start -- cgit v1.2.3