openstack
/
kolla
Code Issues Proposed changes

Merge "mistral-event-engine: enable for Debian/Ubuntu"

This commit is contained in:
Zuul 2019-10-02 11:20:13 +00:00 committed by Gerrit Code Review
parent 7e622f4b7e d7d6ebdd34
commit 968c9526ff
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/mistral/mistral-event-engine/Dockerfile.j2
View File

@ -8,12 +8,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set mistral_event_engine_packages = ['openstack-mistral-event-engine'] %} {% set mistral_event_engine_packages = ['openstack-mistral-event-engine'] %}
{{ macros.install_packages(mistral_event_engine_packages | customizable("packages")) }}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% set mistral_event_engine_packages = ['mistral-event-engine'] %}
&& /bin/false
{% endif %} {% endif %}
{{ macros.install_packages(mistral_event_engine_packages | customizable("packages")) }}
{% endif %} {% endif %}
{% block mistral_event_engine_footer %}{% endblock %} {% block mistral_event_engine_footer %}{% endblock %}

2
kolla/image/build.py
View File

@ -195,7 +195,6 @@ UNBUILDABLE_IMAGES = {
"ec2-api", "ec2-api",
"heat-all", "heat-all",
"ironic-neutron-agent", "ironic-neutron-agent",
"mistral-event-engine",
"neutron-server-opendaylight", "neutron-server-opendaylight",
"nova-serialproxy", "nova-serialproxy",
"novajoin-base", "novajoin-base",
@ -212,7 +211,6 @@ UNBUILDABLE_IMAGES = {
"ec2-api", "ec2-api",
"heat-all", "heat-all",
"ironic-neutron-agent", "ironic-neutron-agent",
"mistral-event-engine",
"novajoin-base", "novajoin-base",
"tacker-base", "tacker-base",
"tripleoclient", "tripleoclient",