openstack
/
kolla
Code Issues Proposed changes

Merge "Add Mistral Binary Containers"

This commit is contained in:
Jenkins 2016-04-21 06:49:37 +00:00 committed by Gerrit Code Review
parent d636ee6781 240ba96af2
commit 549726484f
5 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docker/mistral/mistral-api/Dockerfile.j2
View File

@ -1,6 +1,17 @@
FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }}
MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
openstack-mistral-api \
&& yum clean all
{% endif %}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_mistral_extend_start
RUN chmod 755 /usr/local/bin/kolla_mistral_extend_start

10
docker/mistral/mistral-base/Dockerfile.j2
View File

@ -3,9 +3,19 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
openstack-mistral-common \
&& yum clean all
{% elif base_distro in ['ubuntu'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
{% elif install_type == 'source' %}
ADD mistral-base-archive /mistral-base-source

10
docker/mistral/mistral-engine/Dockerfile.j2
View File

@ -1,6 +1,16 @@
FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }}
MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
openstack-mistral-engine \
&& yum clean all
{% endif %}
{% endif %}
{{ include_footer }}
USER mistral

10
docker/mistral/mistral-executor/Dockerfile.j2
View File

@ -1,6 +1,16 @@
FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }}
MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
openstack-mistral-executor \
&& yum clean all
{% endif %}
{% endif %}
{{ include_footer }}
USER mistral

2
tests/test_build.py
View File

@ -68,7 +68,6 @@ class BuildTest(object):
class BuildTestCentosBinary(BuildTest, base.BaseTestCase):
excluded_images = ["murano-base",
"mistral-base",
"murano-base"]
def setUp(self):
@ -110,7 +109,6 @@ class BuildTestUbuntuSource(BuildTest, base.BaseTestCase):
class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase):
excluded_images = ["murano-base",
"mistral-base",
"murano-base"]
def setUp(self):