Merge "Prevent apache from listening on port 80"

3 files changed, 21 insertions, 7 deletions

diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2
index ac2860c89..6c6800fba 100644
--- a/docker/cinder/cinder-api/Dockerfile.j2
+++ b/docker/cinder/cinder-api/Dockerfile.j2
@@ -12,14 +12,17 @@ MAINTAINER {{ maintainer }}
                 'httpd',
                 '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'] %}
         {% set cinder_api_packages = [
                 'cinder-api',
                 'apache2',
                 'libapache2-mod-wsgi'
         ] %}
-    {% endif %}
 {{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
+RUN echo > /etc/apache2/ports.conf
+    {% endif %}
 
 {% elif install_type == 'source' %}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
@@ -27,13 +30,16 @@ MAINTAINER {{ maintainer }}
                 'httpd',
                 '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'] %}
         {% set cinder_api_packages = [
                 'apache2',
                 'libapache2-mod-wsgi'
         ] %}
-    {% endif %}
 {{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
+RUN echo > /etc/apache2/ports.conf
+    {% endif %}
 
 {% endif %}
 
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
diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2
index 0e9eeb124..287b3a2d0 100644
--- a/docker/nova/nova-api/Dockerfile.j2
+++ b/docker/nova/nova-api/Dockerfile.j2
@@ -13,6 +13,8 @@ MAINTAINER {{ maintainer }}
             'httpd',
             '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'] %}
 
@@ -23,8 +25,9 @@ MAINTAINER {{ maintainer }}
             'libapache2-mod-wsgi'
         ] %}
 
-    {% endif %}
 {{ macros.install_packages(nova_api_packages | customizable("packages")) }}
+RUN echo > /etc/apache2/ports.conf
+    {% endif %}
 
 {% elif install_type == 'source' %}
 
@@ -34,6 +37,8 @@ MAINTAINER {{ maintainer }}
             'httpd',
             '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'] %}
 
@@ -42,9 +47,10 @@ MAINTAINER {{ maintainer }}
             'libapache2-mod-wsgi'
         ] %}
 
-    {% endif %}
-
 {{ macros.install_packages(nova_api_packages | customizable("packages")) }}
+RUN echo > /etc/apache2/ports.conf
+
+    {% endif %}
 
 {% endif %}