diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-15 08:58:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-15 08:58:55 +0000 |
| commit | 4b271c7e4a0d42613ae85e3662acc9aca3d1773e (patch) | |
| tree | 8aabc68c67dcea46c9aa56a479f323feed8d3afe | |
| parent | 9ed6712bd19b9392f2e34b848ee8388c70c8e554 (diff) | |
| parent | 739d6579187e47892cff3c6ef090130b2f254039 (diff) | |
| download | kolla-4b271c7e4a0d42613ae85e3662acc9aca3d1773e.tar.gz kolla-4b271c7e4a0d42613ae85e3662acc9aca3d1773e.zip | |
Merge "Add support for mistral ubuntu binary containers"
| -rw-r--r-- | docker/mistral/mistral-api/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/mistral/mistral-base/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/mistral/mistral-engine/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/mistral/mistral-executor/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | tests/test_build.py | 3 |
5 files changed, 22 insertions, 4 deletions
diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2 index 0e06ec0b9..c2b3e3ea8 100644 --- a/docker/mistral/mistral-api/Dockerfile.j2 +++ b/docker/mistral/mistral-api/Dockerfile.j2 @@ -8,6 +8,12 @@ RUN yum -y install \ openstack-mistral-api \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get -y install --no-install-recommends \ + mistral-api \ + && apt-get clean + {% endif %} {% endif %} diff --git a/docker/mistral/mistral-base/Dockerfile.j2 b/docker/mistral/mistral-base/Dockerfile.j2 index 7fc969923..782d31c97 100644 --- a/docker/mistral/mistral-base/Dockerfile.j2 +++ b/docker/mistral/mistral-base/Dockerfile.j2 @@ -11,8 +11,9 @@ RUN yum -y install \ {% elif base_distro in ['ubuntu'] %} -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false +RUN apt-get -y install --no-install-recommends \ + mistral-common \ + && apt-get clean {% endif %} diff --git a/docker/mistral/mistral-engine/Dockerfile.j2 b/docker/mistral/mistral-engine/Dockerfile.j2 index 302048be4..7381290f1 100644 --- a/docker/mistral/mistral-engine/Dockerfile.j2 +++ b/docker/mistral/mistral-engine/Dockerfile.j2 @@ -8,6 +8,12 @@ RUN yum -y install \ openstack-mistral-engine \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get -y install --no-install-recommends \ + mistral-engine \ + && apt-get clean + {% endif %} {% endif %} diff --git a/docker/mistral/mistral-executor/Dockerfile.j2 b/docker/mistral/mistral-executor/Dockerfile.j2 index 897743545..b5b426cdd 100644 --- a/docker/mistral/mistral-executor/Dockerfile.j2 +++ b/docker/mistral/mistral-executor/Dockerfile.j2 @@ -8,6 +8,12 @@ RUN yum -y install \ openstack-mistral-executor \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get -y install --no-install-recommends \ + mistral-executor \ + && apt-get clean + {% endif %} {% endif %} diff --git a/tests/test_build.py b/tests/test_build.py index 075063f87..373fdcbfb 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -86,8 +86,7 @@ class BuildTestCentosSource(BuildTest, base.BaseTestCase): class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase): - excluded_images = ["mistral-base", - "zaqar"] + excluded_images = ["zaqar"] def setUp(self): super(BuildTestUbuntuBinary, self).setUp() |