From ccc2ad57eb0bc6a53de3af5a5df8db834d42a0a0 Mon Sep 17 00:00:00 2001
From: Andrey Shestakov <ashestakov@mirantis.com>
Date: Thu, 14 Jan 2016 18:34:12 +0200
Subject: [PATCH] Ironic ubuntu binary container

Change-Id: I94ef03c11657d36261f3ddc63056422f84ec2c6a
Partially-Implements: blueprint binary-ubuntu
---
 docker/ironic/ironic-api/Dockerfile.j2        |  6 ++++++
 docker/ironic/ironic-base/Dockerfile.j2       |  6 ++++++
 docker/ironic/ironic-conductor/Dockerfile.j2  | 11 +++++++++--
 docker/nova/nova-compute-ironic/Dockerfile.j2 |  2 ++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2
index 211b42f579..c83449285a 100644
--- a/docker/ironic/ironic-api/Dockerfile.j2
+++ b/docker/ironic/ironic-api/Dockerfile.j2
@@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }}
 RUN yum -y install openstack-ironic-api \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        ironic-api \
+    && apt-get clean
+
     {% endif %}
 {% endif %}
 
diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2
index b4f5037c8e..499f346231 100644
--- a/docker/ironic/ironic-base/Dockerfile.j2
+++ b/docker/ironic/ironic-base/Dockerfile.j2
@@ -8,6 +8,12 @@ RUN yum -y install \
         openstack-ironic-common \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        ironic-common \
+    && apt-get clean
+
     {% endif %}
 {% elif install_type == 'source' %}
 
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index 4372ff6efc..fac65c9301 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -7,6 +7,14 @@ MAINTAINER {{ maintainer }}
 RUN yum -y install openstack-ironic-conductor \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        ironic-conductor \
+        qemu-utils \
+        ipmitool \
+    && apt-get clean
+
     {% endif %}
 {% elif install_type == 'source' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
@@ -14,8 +22,7 @@ RUN yum -y install openstack-ironic-conductor \
 RUN yum -y install ipmitool \
     && yum clean all
 
-    {% endif %}
-    {% if base_distro in ['ubuntu', 'debian'] %}
+    {% elif base_distro in ['ubuntu', 'debian'] %}
 
 RUN apt-get install -y --no-install-recommends \
         qemu-utils \
diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/docker/nova/nova-compute-ironic/Dockerfile.j2
index 654fdeda60..f8c9c518d6 100644
--- a/docker/nova/nova-compute-ironic/Dockerfile.j2
+++ b/docker/nova/nova-compute-ironic/Dockerfile.j2
@@ -14,6 +14,8 @@ RUN apt-get install -y --no-install-recommends \
         nova-compute \
     && apt-get clean
 
+RUN rm /etc/nova/nova-compute.conf
+
     {% endif %}
 {% endif %}