aboutsummaryrefslogtreecommitdiff
path: root/docker/ironic
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2017-03-23 09:45:50 +0100
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2017-03-23 19:05:21 +0200
commitf88ca0f862da4b040b9e0aaac7ac1b952bd0c08b (patch)
tree7ca214f030984b6919ef54a00afe5d98c2ac8540 /docker/ironic
parent336b964f5379b56edbec476913a1b54137ee1de8 (diff)
downloadkolla-f88ca0f862da4b040b9e0aaac7ac1b952bd0c08b.tar.gz
kolla-f88ca0f862da4b040b9e0aaac7ac1b952bd0c08b.zip
Prevent apache from listening on port 80
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
Diffstat (limited to 'docker/ironic')
-rw-r--r--docker/ironic/ironic-pxe/Dockerfile.j26
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2
index 7540b536a..658a83d63 100644
--- a/docker/ironic/ironic-pxe/Dockerfile.j2
+++ b/docker/ironic/ironic-pxe/Dockerfile.j2
@@ -13,6 +13,8 @@ MAINTAINER {{ maintainer }}
'ipxe-bootimgs',
'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'] %}
{% set ironic_pxe_packages = [
'tftpd-hpa',
@@ -23,9 +25,9 @@ MAINTAINER {{ maintainer }}
'ipxe',
'libapache2-mod-wsgi'
] %}
-{% endif %}
-
{{ macros.install_packages(ironic_pxe_packages | customizable("packages")) }}
+RUN echo > /etc/apache2/ports.conf
+{% endif %}
COPY tftp-map-file /map-file
COPY extend_start.sh /usr/local/bin/kolla_ironic_extend_start