diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-21 06:49:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-21 06:49:37 +0000 |
| commit | 549726484f93ffed9aa929f47a931c2f4588241f (patch) | |
| tree | 0f189eac5fb0f41eff46270451fa8cef96e9ee05 | |
| parent | d636ee67815a1cc2c0bab7eac0554cbb4a54bc5e (diff) | |
| parent | 240ba96af2eb7d45f4df7ad80e83bd3643763508 (diff) | |
| download | kolla-549726484f93ffed9aa929f47a931c2f4588241f.tar.gz kolla-549726484f93ffed9aa929f47a931c2f4588241f.zip | |
Merge "Add Mistral Binary Containers"
| -rw-r--r-- | docker/mistral/mistral-api/Dockerfile.j2 | 11 | ||||
| -rw-r--r-- | docker/mistral/mistral-base/Dockerfile.j2 | 10 | ||||
| -rw-r--r-- | docker/mistral/mistral-engine/Dockerfile.j2 | 10 | ||||
| -rw-r--r-- | docker/mistral/mistral-executor/Dockerfile.j2 | 10 | ||||
| -rw-r--r-- | tests/test_build.py | 2 |
5 files changed, 41 insertions, 2 deletions
diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2 index 716ab07eb..b74227570 100644 --- a/docker/mistral/mistral-api/Dockerfile.j2 +++ b/docker/mistral/mistral-api/Dockerfile.j2 @@ -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 diff --git a/docker/mistral/mistral-base/Dockerfile.j2 b/docker/mistral/mistral-base/Dockerfile.j2 index 6f37014f4..7fc969923 100644 --- a/docker/mistral/mistral-base/Dockerfile.j2 +++ b/docker/mistral/mistral-base/Dockerfile.j2 @@ -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 diff --git a/docker/mistral/mistral-engine/Dockerfile.j2 b/docker/mistral/mistral-engine/Dockerfile.j2 index 75649cf47..302048be4 100644 --- a/docker/mistral/mistral-engine/Dockerfile.j2 +++ b/docker/mistral/mistral-engine/Dockerfile.j2 @@ -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 diff --git a/docker/mistral/mistral-executor/Dockerfile.j2 b/docker/mistral/mistral-executor/Dockerfile.j2 index 75649cf47..897743545 100644 --- a/docker/mistral/mistral-executor/Dockerfile.j2 +++ b/docker/mistral/mistral-executor/Dockerfile.j2 @@ -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 diff --git a/tests/test_build.py b/tests/test_build.py index 4f26940d2..f24e6a9fc 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -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): |