openstack/kolla
Code Issues Proposed changes

Fix apache configuration for ceilometer_api

Browse Source 
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
This commit is contained in:
Mathias Ewald 2017-06-20 10:00:52 +02:00
parent 2627e3c009
commit c8c6042364
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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