Merge "Cinder ubuntu binary container"

5 files changed, 41 insertions, 0 deletions

diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2
index e0769302c..d9b819e5d 100644
--- a/docker/cinder/cinder-api/Dockerfile.j2
+++ b/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 %}
 
diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2
index 054982359..74a5ebea1 100644
--- a/docker/cinder/cinder-backup/Dockerfile.j2
+++ b/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
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index 5fecd137d..269f89f6b 100644
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ b/docker/cinder/cinder-base/Dockerfile.j2
@@ -13,6 +13,15 @@ RUN yum -y install openstack-cinder \
   && 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 %}
 {% elif install_type == 'source' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
diff --git a/docker/cinder/cinder-scheduler/Dockerfile.j2 b/docker/cinder/cinder-scheduler/Dockerfile.j2
index 054982359..2e2a12675 100644
--- a/docker/cinder/cinder-scheduler/Dockerfile.j2
+++ b/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
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2
index e3aef3fc2..7a98145ef 100644
--- a/docker/cinder/cinder-volume/Dockerfile.j2
+++ b/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 %}