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
)
This commit is contained in:
parent
cd4d4b37be
commit
cc6694dbc8
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue