Merge "Cinder ubuntu binary container"

docker/cinder/cinder-api/Dockerfile.j2

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

docker/cinder/cinder-backup/Dockerfile.j2

@@ -1,6 +1,16 @@
 FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% if install_type == 'binary' %}
+    {% if base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        cinder-backup \
+    && apt-get clean
+
+    {% endif %}
+{% endif %}
+
 {{ include_footer }}
 
 USER cinder

docker/cinder/cinder-base/Dockerfile.j2

@@ -11,6 +11,15 @@ RUN yum -y install openstack-cinder \
     ceph-common \
     python-oslo-policy \
   && yum clean all \
+  && mkdir -p /etc/ceph
+
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        cinder-common \
+        ceph-common \
+        lvm2 \
+    && apt-get clean \
     && mkdir -p /etc/ceph
 
     {% endif %}

docker/cinder/cinder-scheduler/Dockerfile.j2

@@ -1,6 +1,16 @@
 FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% if install_type == 'binary' %}
+    {% if base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        cinder-scheduler \
+    && apt-get clean
+
+    {% endif %}
+{% endif %}
+
 {{ include_footer }}
 
 USER cinder

docker/cinder/cinder-volume/Dockerfile.j2

@@ -9,6 +9,12 @@ RUN yum install -y \
         scsi-target-utils \
     && yum clean all
 
+   {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        cinder-volume \
+    && apt-get clean
+
     {% endif %}
 {% endif %}