Refactor httpd install to base image

Refactor installing and initial setup of httpd and mod wsgi from
individual services to base image.

Change-Id: I651a55a9ebe258ef403d33de010a4dfb368a4021

1 files changed, 7 insertions, 33 deletions

diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2
index ec55885fb..238c39fd8 100644
--- a/docker/aodh/aodh-base/Dockerfile.j2
+++ b/docker/aodh/aodh-base/Dockerfile.j2
@@ -14,61 +14,35 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
        {# NOTE(aschultz): added api because the common package doesn't include the wsgi file. I think this needs fixing #}
        {% set aodh_base_packages = [
-            'httpd',
-            'mod_ssl',
             'openstack-aodh-api',
             'openstack-aodh-common',
-            'python3-ldappool',
-            'python3-mod_wsgi'
+            'python3-ldappool'
         ] %}
 
 {{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
 RUN mkdir -p /var/www/cgi-bin/aodh \
-    && cp -a /usr/bin/aodh-api /var/www/cgi-bin/aodh/ \
-    && sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
-    && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
+    && cp -a /usr/bin/aodh-api /var/www/cgi-bin/aodh/
     {% elif base_package_type == 'deb' %}
 
        {% set aodh_base_packages = [
             'aodh-common',
-            'apache2',
-            'libapache2-mod-wsgi-py3',
             'python3-aodh',
             'python3-ldappool'
         ] %}
 
 {{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
 RUN mkdir -p /var/www/cgi-bin/aodh \
-    && cp -a /usr/lib/python3/dist-packages/aodh/api/app.wsgi /var/www/cgi-bin/aodh/ \
-    && echo > /etc/apache2/ports.conf
+    && cp -a /usr/lib/python3/dist-packages/aodh/api/app.wsgi /var/www/cgi-bin/aodh/
     {% endif %}
 
 {% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
-
-       {% set aodh_base_packages = [
-            'httpd',
-            'mod_ssl',
-            'python3-ldappool',
-            'python3-mod_wsgi'
-        ] %}
-
-{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
-RUN mkdir -p /var/www/cgi-bin/aodh \
-    && sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
-    && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
-    {% elif base_package_type == 'deb' %}
 
-       {% set aodh_base_packages = [
-            'apache2',
-            'libapache2-mod-wsgi-py3',
-            'python3-ldappool'
-        ] %}
+   {% set aodh_base_packages = [
+        'python3-ldappool'
+    ] %}
 
 {{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
-RUN mkdir -p /var/www/cgi-bin/aodh \
-    && echo > /etc/apache2/ports.conf
-    {% endif %}
+RUN mkdir -p /var/www/cgi-bin/aodh
 
 ADD aodh-base-archive /aodh-base-source