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

2 files changed, 44 insertions, 4 deletions

diff --git a/docker/vitrage/vitrage-base/Dockerfile.j2 b/docker/vitrage/vitrage-base/Dockerfile.j2
index 1cb4ed9f5..9d3aba660 100644
--- a/docker/vitrage/vitrage-base/Dockerfile.j2
+++ b/docker/vitrage/vitrage-base/Dockerfile.j2
@@ -9,11 +9,48 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% if install_type == 'binary' %}
 
+    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+
+        {% set vitrage_base_packages = [
+            'openstack-vitrage-common'
+        ] %}
+
+{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }}
+
+    {% elif base_distro in ['debian', 'ubuntu'] %}
+
 RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
     && /bin/false
 
+    {% endif %}
+
 {% elif install_type == 'source' %}
 
+    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+
+        {% set vitrage_base_packages = [
+            'httpd',
+            'mod_wsgi',
+            'mod_ssl',
+            'python-ldappool'
+        ] %}
+
+{{ macros.install_packages(vitrage_base_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 vitrage_base_packages = [
+            'apache2',
+            'libapache2-mod-wsgi',
+            'python-ldappool'
+        ] %}
+
+{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }}
+RUN echo > /etc/apache2/ports.conf
+{% endif %}
+
 {% set vitrage_base_pip_packages = [
     '/vitrage'
 ] %}
@@ -21,14 +58,15 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 ADD vitrage-base-archive /vitrage-base-source
 RUN ln -s vitrage-base-source/* vitrage \
     && {{ macros.install_pip(vitrage_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/vitrage \
+    && mkdir -p /etc/vitrage /var/www/cgi-bin/vitrage \
     && cp -r /vitrage/etc/vitrage/* /etc/vitrage/ \
-    && chown -R vitrage: /etc/vitrage
+    && cp /vitrage/vitrage/api/app.wsgi /var/www/cgi-bin/vitrage \
+    && chown -R vitrage: /etc/vitrage /var/www/cgi-bin/vitrage
 
 {% endif %}
 
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
-
-RUN chmod 755 /usr/local/bin/kolla_extend_start
+RUN touch /usr/local/bin/kolla_vitrage_extend_start \
+    && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_vitrage_extend_start
 
 {% block vitrage_base_footer %}{% endblock %}
diff --git a/docker/vitrage/vitrage-base/extend_start.sh b/docker/vitrage/vitrage-base/extend_start.sh
index d79635057..3092c8146 100755
--- a/docker/vitrage/vitrage-base/extend_start.sh
+++ b/docker/vitrage/vitrage-base/extend_start.sh
@@ -10,3 +10,5 @@ fi
 if [[ $(stat -c %a ${VITRAGE_LOG_DIR}) != "755" ]]; then
     chmod 755 ${VITRAGE_LOG_DIR}
 fi
+
+. /usr/local/bin/kolla_vitrage_extend_start