From cc6694dbc8907bad5085f9129fccd5b682e72b66 Mon Sep 17 00:00:00 2001 From: Eddie Yen Date: Mon, 15 Jul 2019 13:20:39 +0000 Subject: [PATCH] Delete default gnocchi & aodh wsgi conf in Ubuntu binary Ubuntu distro package will create default wsgi conf in apache during gnocchi-api and aodh-api installation. We need to delete them since we only use the conf that pushed by kolla-ansible. Change-Id: Ib31e733eba12deebdf469c306dfba4191a1b89f5 Related-Bug: 1832306 Related-Bug: 1836520 (cherry picked from commit 5eb780d0b0d12186c57b828320c3421b98b97840) --- docker/aodh/aodh-api/Dockerfile.j2 | 4 ++++ docker/gnocchi/gnocchi-api/Dockerfile.j2 | 4 ++++ 2 files changed, 8 insertions(+) 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