diff options
| author | Zuul <zuul@review.opendev.org> | 2019-10-02 11:20:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-10-02 11:20:13 +0000 |
| commit | 968c9526ff2eeafaa13207a791f61173db604fff (patch) | |
| tree | 504404f1fe97cf929e59b5d7b91349ded16a0cd2 | |
| parent | 7e622f4b7e190ad140ff29dbded8b733bfca758b (diff) | |
| parent | d7d6ebdd3462cb2ffe4b0199508a174ce0cc2171 (diff) | |
| download | kolla-968c9526ff2eeafaa13207a791f61173db604fff.tar.gz kolla-968c9526ff2eeafaa13207a791f61173db604fff.zip | |
Merge "mistral-event-engine: enable for Debian/Ubuntu"
| -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", |