diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-10-01 04:48:26 -0700 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-10-01 04:49:46 -0700 |
| commit | d7d6ebdd3462cb2ffe4b0199508a174ce0cc2171 (patch) | |
| tree | 0dc93e5114550c08f30a2c612bb067e764ade9f0 | |
| parent | a9181bf89529756e4d58b22324988b4e57770ec1 (diff) | |
| download | kolla-d7d6ebdd3462cb2ffe4b0199508a174ce0cc2171.tar.gz kolla-d7d6ebdd3462cb2ffe4b0199508a174ce0cc2171.zip | |
mistral-event-engine: enable for Debian/Ubuntu
Depends-On: https://review.opendev.org/685901
Change-Id: I0c5e5cc895238094e30fac49dfc6e7bd880ca55e
| -rw-r--r-- | docker/mistral/mistral-event-engine/Dockerfile.j2 | 5 | ||||
| -rwxr-xr-x | kolla/image/build.py | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/docker/mistral/mistral-event-engine/Dockerfile.j2 b/docker/mistral/mistral-event-engine/Dockerfile.j2 index 69b89cb4f..33dce0bfb 100644 --- a/docker/mistral/mistral-event-engine/Dockerfile.j2 +++ b/docker/mistral/mistral-event-engine/Dockerfile.j2 @@ -8,12 +8,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_package_type == 'rpm' %} {% set mistral_event_engine_packages = ['openstack-mistral-event-engine'] %} -{{ macros.install_packages(mistral_event_engine_packages | customizable("packages")) }} {% elif base_package_type == 'deb' %} -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false + {% set mistral_event_engine_packages = ['mistral-event-engine'] %} {% endif %} +{{ macros.install_packages(mistral_event_engine_packages | customizable("packages")) }} {% endif %} {% block mistral_event_engine_footer %}{% endblock %} diff --git a/kolla/image/build.py b/kolla/image/build.py index 27d1edf71..879ba6dbb 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -195,7 +195,6 @@ UNBUILDABLE_IMAGES = { "ec2-api", "heat-all", "ironic-neutron-agent", - "mistral-event-engine", "neutron-server-opendaylight", "nova-serialproxy", "novajoin-base", @@ -212,7 +211,6 @@ UNBUILDABLE_IMAGES = { "ec2-api", "heat-all", "ironic-neutron-agent", - "mistral-event-engine", "novajoin-base", "tacker-base", "tripleoclient", |