openstack/kolla
Code Issues Proposed changes

Prevent apache from listening on port 80

Browse Source 
A few new images got apache as part of blueprint
apache-packages-for-apis without restricting it to listen on port 80.
This commit fixes it for all images with the exception of heat-base so
that it can be cleanly backported to stable/ocata.

Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Change-Id: Idd3bbeffea9233eaed420798e22ea9a3a517c166
Closes-Bug: #1675308
This commit is contained in:
Martin André 2017-03-23 09:45:50 +01:00 committed by Juan Antonio Osorio Robles
parent 336b964f53
commit f88ca0f862
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/cinder/cinder-api/Dockerfile.j2
View File

@ -12,14 +12,17 @@ MAINTAINER {{ maintainer }}
'httpd', 'httpd',
'mod_wsgi' 'mod_wsgi'
] %} ] %}
{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set cinder_api_packages = [ {% set cinder_api_packages = [
'cinder-api', 'cinder-api',
'apache2', 'apache2',
'libapache2-mod-wsgi' 'libapache2-mod-wsgi'
] %} ] %}
{% endif %}
{{ macros.install_packages(cinder_api_packages | customizable("packages")) }} {{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
@ -27,13 +30,16 @@ MAINTAINER {{ maintainer }}
'httpd', 'httpd',
'mod_wsgi' 'mod_wsgi'
] %} ] %}
{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set cinder_api_packages = [ {% set cinder_api_packages = [
'apache2', 'apache2',
'libapache2-mod-wsgi' 'libapache2-mod-wsgi'
] %} ] %}
{% endif %}
{{ macros.install_packages(cinder_api_packages | customizable("packages")) }} {{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %}
{% endif %} {% endif %}

6
docker/ironic/ironic-pxe/Dockerfile.j2
View File

@ -13,6 +13,8 @@ MAINTAINER {{ maintainer }}
'ipxe-bootimgs', 'ipxe-bootimgs',
'mod_wsgi' 'mod_wsgi'
] %} ] %}
{{ macros.install_packages(ironic_pxe_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
{% set ironic_pxe_packages = [ {% set ironic_pxe_packages = [
'tftpd-hpa', 'tftpd-hpa',
@ -23,9 +25,9 @@ MAINTAINER {{ maintainer }}
'ipxe', 'ipxe',
'libapache2-mod-wsgi' 'libapache2-mod-wsgi'
] %} ] %}
{% endif %}
{{ macros.install_packages(ironic_pxe_packages | customizable("packages")) }} {{ macros.install_packages(ironic_pxe_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %}
COPY tftp-map-file /map-file COPY tftp-map-file /map-file
COPY extend_start.sh /usr/local/bin/kolla_ironic_extend_start COPY extend_start.sh /usr/local/bin/kolla_ironic_extend_start

12
docker/nova/nova-api/Dockerfile.j2
View File

@ -13,6 +13,8 @@ MAINTAINER {{ maintainer }}
'httpd', 'httpd',
'mod_wsgi' 'mod_wsgi'
] %} ] %}
{{ macros.install_packages(nova_api_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
@ -23,8 +25,9 @@ MAINTAINER {{ maintainer }}
'libapache2-mod-wsgi' 'libapache2-mod-wsgi'
] %} ] %}
{% endif %}
{{ macros.install_packages(nova_api_packages | customizable("packages")) }} {{ macros.install_packages(nova_api_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
@ -34,6 +37,8 @@ MAINTAINER {{ maintainer }}
'httpd', 'httpd',
'mod_wsgi' 'mod_wsgi'
] %} ] %}
{{ macros.install_packages(nova_api_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
@ -42,9 +47,10 @@ MAINTAINER {{ maintainer }}
'libapache2-mod-wsgi' 'libapache2-mod-wsgi'
] %} ] %}
{% endif %}
{{ macros.install_packages(nova_api_packages | customizable("packages")) }} {{ macros.install_packages(nova_api_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %}
{% endif %} {% endif %}