Merge "Ironic ubuntu binary container"

4 files changed, 23 insertions, 2 deletions

diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2
index 211b42f57..c83449285 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 b4f5037c8..499f34623 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 4372ff6ef..fac65c930 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 654fdeda6..f8c9c518d 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 %}