Fix vitrage images

Vitrage start api service under apache or uwsgi.
We have not created a migration to uwsgi.
This change adds apache packages needed for api
also add rdo binaries to rpm distros.

Adds missing collector image.

Change-Id: Iecb32e321b46f9b567af25fa6acafbe9a292bbca
Closes-Bug: #1681613

1 files changed, 24 insertions, 2 deletions

diff --git a/docker/vitrage/vitrage-api/Dockerfile.j2 b/docker/vitrage/vitrage-api/Dockerfile.j2
index c5f88d79d..5a9cae22e 100644
--- a/docker/vitrage/vitrage-api/Dockerfile.j2
+++ b/docker/vitrage/vitrage-api/Dockerfile.j2
@@ -3,14 +3,36 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% block vitrage_api_header %}{% endblock %}
 
+{% import "macros.j2" as macros with context %}
+
 {% if install_type == 'binary' %}
 
+    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+
+        {% set vitrage_api_packages = [
+            'httpd',
+            'mod_wsgi',
+            'mod_ssl',
+            'python-ldappool',
+            'openstack-vitrage-api'
+        ] %}
+
+{{ macros.install_packages(vitrage_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'] %}
+
 RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
     && /bin/false
 
+    {% endif %}
+
 {% endif %}
 
+
+COPY extend_start.sh /usr/local/bin/kolla_vitrage_extend_start
+RUN chmod 755 /usr/local/bin/kolla_vitrage_extend_start
+
 {% block vitrage_api_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-
-USER vitrage