Merge "Add httpd to the Barbican API image"

docker/barbican/barbican-api/Dockerfile.j2

@@ -8,18 +8,32 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
        {% set barbican_api_packages = [
+                'httpd',
+                'mod_ssl',
+                'mod_wsgi',
                 'openstack-barbican-api',
                 'uwsgi-plugin-python'
        ] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
-        {% set barbican_api_packages = [
-                'barbican-api',
-                'uwsgi-plugin-python'
-        ] %}
-    {% endif %}
 
 {{ macros.install_packages(barbican_api_packages | customizable("packages")) }}
 
+RUN 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_distro in ['debian', 'ubuntu'] %}
+        {% set barbican_api_packages = [
+                'apache2',
+                'barbican-api',
+                'libapache2-mod-wsgi',
+                'uwsgi-plugin-python'
+        ] %}
+
+{{ macros.install_packages(barbican_api_packages | customizable("packages")) }}
+
+RUN echo > /etc/apache2/ports.conf
+
+    {% endif %}
+
 {% endif %}
 
 COPY extend_start.sh /usr/local/bin/kolla_barbican_extend_start

docker/barbican/barbican-api/extend_start.sh

@@ -6,3 +6,16 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     barbican-db-manage upgrade
     exit 0
 fi
+
+# Assume the service runs on top of Apache when user is root
+if [[ "$(whoami)" == 'root' ]]; then
+    # NOTE(pbourke): httpd will not clean up after itself in some cases which
+    # results in the container not being able to restart. (bug #1489676, 1557036)
+    if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
+        # Loading Apache2 ENV variables
+        . /etc/apache2/envvars
+        rm -rf /var/run/apache2/*
+    else
+        rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*
+    fi
+fi

releasenotes/notes/use-barbican-with-httpd-d6d7599c07315e32.yaml

@@ -0,0 +1,4 @@
+---
+other:
+  - |
+    HTTPd was added to the barbican-api image.