diff options
| author | Eddie Yen <missile0407@gmail.com> | 2019-07-15 13:20:39 +0000 |
|---|---|---|
| committer | Eddie Yen <missile0407@gmail.com> | 2019-07-17 14:27:35 +0000 |
| commit | 5eb780d0b0d12186c57b828320c3421b98b97840 (patch) | |
| tree | 07cf0b63d5ee49ed303d92692f5ee3ae1eefe500 | |
| parent | ef6a62de1c91fec16d20485c0bef16cf93346227 (diff) | |
| download | kolla-5eb780d0b0d12186c57b828320c3421b98b97840.tar.gz kolla-5eb780d0b0d12186c57b828320c3421b98b97840.zip | |
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
| -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 |