1 files changed, 9 insertions, 3 deletions
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 %}