openstack
/
kolla
Code Issues Proposed changes

Merge "Delete default gnocchi & aodh wsgi conf in Ubuntu binary" into stable/stein

This commit is contained in:
Zuul 2019-08-20 11:18:18 +00:00 committed by Gerrit Code Review
parent fb723191bb cc6694dbc8
commit 7f719b1865
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

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

@ -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