diff options
| author | Zuul <zuul@review.opendev.org> | 2019-07-17 17:21:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-07-17 17:21:39 +0000 |
| commit | 0e766d57ad2cfe3c355b7b4ff9dad18ee0354129 (patch) | |
| tree | 54fcd70246c0440cf1011b090fbdaea2ffa6a5d6 /docker | |
| parent | 21ad3d1b1307e35550309a1a04f8d80242eb9872 (diff) | |
| parent | 5eb780d0b0d12186c57b828320c3421b98b97840 (diff) | |
| download | kolla-0e766d57ad2cfe3c355b7b4ff9dad18ee0354129.tar.gz kolla-0e766d57ad2cfe3c355b7b4ff9dad18ee0354129.zip | |
Merge "Delete default gnocchi & aodh wsgi conf in Ubuntu binary"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/aodh/aodh-api/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/gnocchi/gnocchi-api/Dockerfile.j2 | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2 index abee6811e..01ac126ad 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 863018336..535831cff 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 |