diff options
| author | Eduardo Gonzalez <dabarren@gmail.com> | 2017-09-01 12:45:12 +0200 |
|---|---|---|
| committer | Eduardo Gonzalez <dabarren@gmail.com> | 2017-10-14 16:54:00 +0000 |
| commit | 02ce804a441a42b2f4dca03b2e3fb0ba054cfe33 (patch) | |
| tree | eb74c59c687142221faf749cdba4eda583597e8c /docker/vitrage/vitrage-api | |
| parent | 2ef0bd51a93a3d0d5e963824a7e5fb2ea556239e (diff) | |
| download | kolla-02ce804a441a42b2f4dca03b2e3fb0ba054cfe33.tar.gz kolla-02ce804a441a42b2f4dca03b2e3fb0ba054cfe33.zip | |
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
Diffstat (limited to 'docker/vitrage/vitrage-api')
| -rw-r--r-- | docker/vitrage/vitrage-api/Dockerfile.j2 | 26 | ||||
| -rw-r--r-- | docker/vitrage/vitrage-api/extend_start.sh | 11 |
2 files changed, 35 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 diff --git a/docker/vitrage/vitrage-api/extend_start.sh b/docker/vitrage/vitrage-api/extend_start.sh new file mode 100644 index 000000000..4596bf6a1 --- /dev/null +++ b/docker/vitrage/vitrage-api/extend_start.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +# 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 |