Merge "Nova ubuntu binary container"

docker/nova/nova-api/Dockerfile.j2

@@ -7,6 +7,13 @@ MAINTAINER {{ maintainer }}
 RUN yum -y install openstack-nova-api \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        nova-api \
+        python-memcache \
+    && apt-get clean
+
     {% endif %}
 {% endif %}
 

docker/nova/nova-base/Dockerfile.j2

@@ -15,6 +15,14 @@ RUN yum -y install \
         bridge-utils \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        nova-common \
+        python-nova \
+        bridge-utils \
+    && apt-get clean
+
     {% endif %}
 {% elif install_type == 'source' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

docker/nova/nova-compute-ironic/Dockerfile.j2

@@ -8,6 +8,12 @@ RUN yum -y install \
         openstack-nova-compute \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        nova-compute \
+    && apt-get clean
+
     {% endif %}
 {% endif %}
 

docker/nova/nova-compute/Dockerfile.j2

@@ -11,6 +11,18 @@ RUN yum -y install \
         ceph-common \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+# ironic as workaround https://bugs.launchpad.net/packstack/+bug/1430388
+RUN apt-get install -y --no-install-recommends \
+        nova-compute \
+        openvswitch-switch \
+        sysfsutils \
+        ceph-common \
+        ironic-common \
+        python-ironicclient \
+    && apt-get clean
+
     {% endif %}
 {% elif install_type == 'source' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

docker/nova/nova-conductor/Dockerfile.j2

@@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }}
 RUN yum -y install openstack-nova-conductor \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        nova-conductor \
+    && apt-get clean
+
     {% endif %}
 {% endif %}
 

docker/nova/nova-consoleauth/Dockerfile.j2

@@ -7,6 +7,13 @@ MAINTAINER {{ maintainer }}
 RUN yum -y install openstack-nova-console \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        nova-consoleauth \
+        python-memcache \
+    && apt-get clean
+
     {% endif %}
 {% endif %}
 

docker/nova/nova-network/Dockerfile.j2

@@ -10,6 +10,12 @@ RUN yum -y install \
         initscripts \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        nova-network \
+    && apt-get clean
+
     {% endif %}
 {% elif install_type == 'source' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

docker/nova/nova-novncproxy/Dockerfile.j2

@@ -9,6 +9,12 @@ RUN yum -y install \
         openstack-nova-novncproxy \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        nova-novncproxy \
+    && apt-get clean
+
     {% endif %}
 {% elif install_type == 'source' %}
 

docker/nova/nova-scheduler/Dockerfile.j2

@@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }}
 RUN yum -y install openstack-nova-scheduler \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        nova-scheduler \
+    && apt-get clean
+
     {% endif %}
 {% endif %}
 

docker/nova/nova-spicehtml5proxy/Dockerfile.j2

@@ -7,6 +7,12 @@ MAINTAINER {{ maintainer }}
 RUN yum -y install openstack-nova-spicehtml5proxy \
     && yum clean all
 
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        nova-spiceproxy \
+    && apt-get clean
+
     {% endif %}
 {% elif install_type == 'source' %}