diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-27 17:56:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-27 17:56:52 +0000 |
| commit | 0f6ac6635dcd34a771294d42b0aa937984dbe5ea (patch) | |
| tree | 264fbd775c8d38d1bb1b14ce6256659eeea5e9c5 /docker | |
| parent | 6b8d38c405eb886607fe4c6306f68ea8ad7c8816 (diff) | |
| parent | c8c60423644560aaa06c61541428b8354a89c563 (diff) | |
| download | kolla-0f6ac6635dcd34a771294d42b0aa937984dbe5ea.tar.gz kolla-0f6ac6635dcd34a771294d42b0aa937984dbe5ea.zip | |
Merge "Fix apache configuration for ceilometer_api"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ceilometer/ceilometer-api/Dockerfile.j2 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 index be6ae4b37..04fe138b6 100644 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2 @@ -23,7 +23,9 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 'libapache2-mod-wsgi' ] %} {{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }} -RUN echo > /etc/apache2/ports.conf +RUN echo > /etc/apache2/ports.conf \ + && rm -f /etc/apache2/sites-available/ceilometer-api.conf \ + && a2dissite ceilometer-api {% endif %} |