Browse Source

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 5eb780d0b0)
(cherry picked from commit cc6694dbc8)
tags/7.0.4
Eddie Yen 2 months ago
parent
commit
69e46f78af
2 changed files with 8 additions and 0 deletions
  1. 4
    0
      docker/aodh/aodh-api/Dockerfile.j2
  2. 4
    0
      docker/gnocchi/gnocchi-api/Dockerfile.j2

+ 4
- 0
docker/aodh/aodh-api/Dockerfile.j2 View File

@@ -12,6 +12,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
12 12
         {% set aodh_api_packages = ['aodh-api'] %}
13 13
     {% endif %}
14 14
 {{ macros.install_packages(aodh_api_packages | customizable("packages")) }}
15
+
16
+    {% if base_distro in ['debian', 'ubuntu'] %}
17
+RUN rm -rf /etc/apache2/sites-enabled/aodh-api.conf
18
+    {% endif %}
15 19
 {% endif %}
16 20
 
17 21
 COPY extend_start.sh /usr/local/bin/kolla_aodh_extend_start

+ 4
- 0
docker/gnocchi/gnocchi-api/Dockerfile.j2 View File

@@ -15,6 +15,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
15 15
         {% set gnocchi_api_packages = ['gnocchi-api'] %}
16 16
     {% endif %}
17 17
 {{ macros.install_packages(gnocchi_api_packages | customizable("packages")) }}
18
+
19
+    {% if base_distro in ['debian', 'ubuntu'] %}
20
+RUN rm -rf /etc/apache2/sites-enabled/gnocchi-api.conf
21
+    {% endif %}
18 22
 {% endif %}
19 23
 
20 24
 COPY extend_start.sh /usr/local/bin/kolla_gnocchi_extend_start

Loading…
Cancel
Save