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-graph | |
| 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-graph')
| -rw-r--r-- | docker/vitrage/vitrage-graph/Dockerfile.j2 | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/docker/vitrage/vitrage-graph/Dockerfile.j2 b/docker/vitrage/vitrage-graph/Dockerfile.j2 index b0bd32083..983c39d88 100644 --- a/docker/vitrage/vitrage-graph/Dockerfile.j2 +++ b/docker/vitrage/vitrage-graph/Dockerfile.j2 @@ -3,11 +3,25 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block vitrage_graph_header %}{% endblock %} +{% import "macros.j2" as macros with context %} + {% if install_type == 'binary' %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + + {% set vitrage_graph_packages = [ + 'openstack-vitrage-graph' + ] %} + +{{ macros.install_packages(vitrage_graph_packages | customizable("packages")) }} + + {% elif base_distro in ['debian', 'ubuntu'] %} + RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ && /bin/false + {% endif %} + {% endif %} {% block vitrage_graph_footer %}{% endblock %} |