diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2 index abee6811ec..01ac126ad9 100644 --- a/docker/aodh/aodh-api/Dockerfile.j2 +++ b/docker/aodh/aodh-api/Dockerfile.j2 @@ -12,6 +12,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set aodh_api_packages = ['aodh-api'] %} {% endif %} {{ macros.install_packages(aodh_api_packages | customizable("packages")) }} + + {% if base_package_type == 'deb' %} +RUN rm -rf /etc/apache2/sites-enabled/aodh-api.conf + {% endif %} {% endif %} COPY extend_start.sh /usr/local/bin/kolla_aodh_extend_start diff --git a/docker/gnocchi/gnocchi-api/Dockerfile.j2 b/docker/gnocchi/gnocchi-api/Dockerfile.j2 index 863018336f..535831cffd 100644 --- a/docker/gnocchi/gnocchi-api/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-api/Dockerfile.j2 @@ -15,6 +15,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set gnocchi_api_packages = ['gnocchi-api'] %} {% endif %} {{ macros.install_packages(gnocchi_api_packages | customizable("packages")) }} + + {% if base_package_type == 'deb' %} +RUN rm -rf /etc/apache2/sites-enabled/gnocchi-api.conf + {% endif %} {% endif %} COPY extend_start.sh /usr/local/bin/kolla_gnocchi_extend_start