From 739d6579187e47892cff3c6ef090130b2f254039 Mon Sep 17 00:00:00 2001
From: "Swapnil Kulkarni (coolsvap)" <me@coolsvap.net>
Date: Tue, 17 May 2016 10:01:43 +0530
Subject: [PATCH] Add support for mistral ubuntu binary containers

partially implements blueprint add-mistral-binary

Change-Id: I5aeb4eba3233947421baf0d35319e1090370a61a
Depends-On: If4be00b937e14ec93443dcb7249cf17099d57cbe
---
 docker/mistral/mistral-api/Dockerfile.j2      | 6 ++++++
 docker/mistral/mistral-base/Dockerfile.j2     | 5 +++--
 docker/mistral/mistral-engine/Dockerfile.j2   | 6 ++++++
 docker/mistral/mistral-executor/Dockerfile.j2 | 6 ++++++
 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 0e06ec0b9b..c2b3e3ea8a 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 7fc9699238..782d31c977 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 302048be43..7381290f1c 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 897743545f..b5b426cddc 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 f2e802bf66..945d2b982f 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()