From c8c60423644560aaa06c61541428b8354a89c563 Mon Sep 17 00:00:00 2001 From: Mathias Ewald Date: Tue, 20 Jun 2017 10:00:52 +0200 Subject: Fix apache configuration for ceilometer_api Removes ceilometer-api vhost configuration from apache that comes with ubuntu package to avoid errors resulting from duplicate configurations Remove configuration from apache's sites-enabled configuration Change-Id: I63d7395b134fc815355447f871436a4e8960d015 Closes-Bug: #1695875 --- docker/ceilometer/ceilometer-api/Dockerfile.j2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docker') 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 %} -- cgit v1.2.3