From 94a79b16529529c64c3ca88658b337b171a292d8 Mon Sep 17 00:00:00 2001
From: MD NADEEM <mail2nadeem92@gmail.com>
Date: Wed, 17 Feb 2016 13:17:40 +0530
Subject: [PATCH] Trove ubuntu binary container

Change-Id: I6c49a4c4da3cf6c67778ea9ef310432e93b25a8a
Partially-Implements: blueprint binary-ubuntu
---
 docker/trove/trove-api/Dockerfile.j2         | 6 ++++++
 docker/trove/trove-base/Dockerfile.j2        | 6 ++++++
 docker/trove/trove-conductor/Dockerfile.j2   | 6 ++++++
 docker/trove/trove-guestagent/Dockerfile.j2  | 6 ++++++
 docker/trove/trove-taskmanager/Dockerfile.j2 | 6 ++++++
 5 files changed, 30 insertions(+)

diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2
index 10a46c5bf8..93bcf9ffed 100644
--- a/docker/trove/trove-api/Dockerfile.j2
+++ b/docker/trove/trove-api/Dockerfile.j2
@@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }}
 RUN yum install -y openstack-trove-api \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        trove-api \
+    && apt-get clean
+
     {% endif %}
 {% endif %}
 
diff --git a/docker/trove/trove-base/Dockerfile.j2 b/docker/trove/trove-base/Dockerfile.j2
index cd32f19610..f0f0f76c30 100644
--- a/docker/trove/trove-base/Dockerfile.j2
+++ b/docker/trove/trove-base/Dockerfile.j2
@@ -8,6 +8,12 @@ RUN yum -y install \
         openstack-trove-common \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        trove-common \
+    && apt-get clean
+
     {% endif %}
 
 {% elif install_type == 'source' %}
diff --git a/docker/trove/trove-conductor/Dockerfile.j2 b/docker/trove/trove-conductor/Dockerfile.j2
index a41fdfc0b3..63efeb212c 100644
--- a/docker/trove/trove-conductor/Dockerfile.j2
+++ b/docker/trove/trove-conductor/Dockerfile.j2
@@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }}
 RUN yum install -y openstack-trove-conductor \
   && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        trove-conductor \
+    && apt-get clean
+
     {% endif %}
 {% endif %}
 
diff --git a/docker/trove/trove-guestagent/Dockerfile.j2 b/docker/trove/trove-guestagent/Dockerfile.j2
index 22666b9895..8bfea68e70 100644
--- a/docker/trove/trove-guestagent/Dockerfile.j2
+++ b/docker/trove/trove-guestagent/Dockerfile.j2
@@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }}
 RUN yum install -y openstack-trove-guestagent \
   && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        trove-guestagent \
+    && apt-get clean
+
     {% endif %}
 {% endif %}
 
diff --git a/docker/trove/trove-taskmanager/Dockerfile.j2 b/docker/trove/trove-taskmanager/Dockerfile.j2
index cc3647f97b..e5bb1e4ba4 100644
--- a/docker/trove/trove-taskmanager/Dockerfile.j2
+++ b/docker/trove/trove-taskmanager/Dockerfile.j2
@@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }}
 RUN yum install -y openstack-trove-taskmanager \
   && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        trove-taskmanager \
+    && apt-get clean
+
     {% endif %}
 {% endif %}