diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-05-18 16:56:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-05-18 16:56:12 +0000 |
| commit | d3302929e001b89798727f0e312149c5abc0da5a (patch) | |
| tree | eb63484165eafd5d653593867ff7ed7ebee37490 | |
| parent | 31afb8dd489923e81aec134b21562c9a05db9953 (diff) | |
| parent | d0aaeccbea9543482b045974719544592c65ccb7 (diff) | |
| download | kolla-d3302929e001b89798727f0e312149c5abc0da5a.tar.gz kolla-d3302929e001b89798727f0e312149c5abc0da5a.zip | |
Merge "Add mistral-event-engine image"
| -rw-r--r-- | docker/mistral/mistral-event-engine/Dockerfile.j2 | 22 | ||||
| -rw-r--r-- | releasenotes/notes/add-mistral-event-engine-053ebdfbd50e2e65.yaml | 3 | ||||
| -rw-r--r-- | tests/test_build.py | 2 |
3 files changed, 27 insertions, 0 deletions
diff --git a/docker/mistral/mistral-event-engine/Dockerfile.j2 b/docker/mistral/mistral-event-engine/Dockerfile.j2 new file mode 100644 index 000000000..aa51729a7 --- /dev/null +++ b/docker/mistral/mistral-event-engine/Dockerfile.j2 @@ -0,0 +1,22 @@ +FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% block mistral_event_engine_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{% if install_type == 'binary' %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set mistral_event_engine_packages = ['openstack-mistral-event-engine'] %} + {{ macros.install_packages(mistral_event_engine_packages | customizable("packages")) }} + {% elif base_distro in ['debian', 'ubuntu'] %} +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + {% endif %} + +{% endif %} + +{% block mistral_event_engine_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER mistral diff --git a/releasenotes/notes/add-mistral-event-engine-053ebdfbd50e2e65.yaml b/releasenotes/notes/add-mistral-event-engine-053ebdfbd50e2e65.yaml new file mode 100644 index 000000000..ec9be84b6 --- /dev/null +++ b/releasenotes/notes/add-mistral-event-engine-053ebdfbd50e2e65.yaml @@ -0,0 +1,3 @@ +--- +features: + - Add mistral-event-engine image. diff --git a/tests/test_build.py b/tests/test_build.py index 8a0ff5844..8e7c80d27 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -121,6 +121,7 @@ class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase): "heat-all", "karbor-base", "kuryr-base", + "mistral-event-engine", "monasca-base", "neutron-sfc-agent", "octavia-base", @@ -163,6 +164,7 @@ class BuildTestDebianBinary(BuildTest, base.BaseTestCase): "heat-all", "karbor-base", "kuryr-base", + "mistral-event-engine", "monasca-base", "neutron-sfc-agent", "octavia-base", |