Merge "Remove HTTP configuration shipped in openstack-nova-placement-api RPM" into stable/queens

This commit is contained in:
Zuul 2019-06-19 22:21:09 +00:00 committed by Gerrit Code Review
commit 2d7b3ad5bf
1 changed files with 2 additions and 1 deletions

View File

@ -17,7 +17,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(nova_placement_api_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf \
&& rm -f /etc/httpd/conf.d/00-nova-placement-api.conf
{% elif base_distro in ['debian', 'ubuntu'] %}