diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-27 07:54:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-27 07:54:09 +0000 |
| commit | 464ca08bfee416e5ccc05e3827aecc9ff9f4956d (patch) | |
| tree | ad42538d1d8318928f08a881de9aee5e4d082ea0 /docker/ironic | |
| parent | 13ec42e2a93be480a0aba75fbd8b12d3e9ed027a (diff) | |
| parent | f88ca0f862da4b040b9e0aaac7ac1b952bd0c08b (diff) | |
| download | kolla-464ca08bfee416e5ccc05e3827aecc9ff9f4956d.tar.gz kolla-464ca08bfee416e5ccc05e3827aecc9ff9f4956d.zip | |
Merge "Prevent apache from listening on port 80"
Diffstat (limited to 'docker/ironic')
| -rw-r--r-- | docker/ironic/ironic-pxe/Dockerfile.j2 | 6 |
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 |