diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-17 11:40:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-17 11:40:24 +0000 |
| commit | 95e421483e0ff7d7112b7ab981a32e24bf287c6f (patch) | |
| tree | bb03754845892b5991a2c81f0227439e3285164e | |
| parent | ab8bcf5a4f4b1a6a8ae698eda80f2a93d00aa84e (diff) | |
| parent | f7cf4df5ada5553ce4cf2433ebf40276fe59a803 (diff) | |
| download | kolla-95e421483e0ff7d7112b7ab981a32e24bf287c6f.tar.gz kolla-95e421483e0ff7d7112b7ab981a32e24bf287c6f.zip | |
Merge "Add vitrage-persistor image" into stable/stein
| -rw-r--r-- | docker/vitrage/vitrage-persistor/Dockerfile.j2 | 42 | ||||
| -rw-r--r-- | releasenotes/notes/bug-1869319-aa032c1330b540dc.yaml | 6 |
2 files changed, 48 insertions, 0 deletions
diff --git a/docker/vitrage/vitrage-persistor/Dockerfile.j2 b/docker/vitrage/vitrage-persistor/Dockerfile.j2 new file mode 100644 index 000000000..f07d930f3 --- /dev/null +++ b/docker/vitrage/vitrage-persistor/Dockerfile.j2 @@ -0,0 +1,42 @@ +FROM {{ namespace }}/{{ image_prefix }}vitrage-base:{{ tag }} +{% block labels %} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} + +{% block vitrage_persistor_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{% if install_type == 'binary' %} + + {% if base_package_type == 'rpm' %} + + {% set vitrage_persistor_packages = [ + 'openstack-vitrage-persistor' + ] %} + +{{ macros.install_packages(vitrage_persistor_packages | customizable("packages")) }} + + {% elif base_package_type == 'deb' %} + {% if base_distro == 'debian' %} + + {% set vitrage_persistor_packages = [ + 'vitrage-persistor' + ] %} + +{{ macros.install_packages(vitrage_persistor_packages | customizable("packages")) }} + + {% else %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + + {% endif %} + {% endif %} + +{% endif %} + +{% block vitrage_persistor_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER vitrage diff --git a/releasenotes/notes/bug-1869319-aa032c1330b540dc.yaml b/releasenotes/notes/bug-1869319-aa032c1330b540dc.yaml new file mode 100644 index 000000000..1e6cd825f --- /dev/null +++ b/releasenotes/notes/bug-1869319-aa032c1330b540dc.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Adds missing ``vitrage-persistor`` image, required by Vitrage + deployments for storing data. + `LP#1869319 <https://launchpad.net/bugs/1869319>`__ |