5 files changed, 23 insertions, 12 deletions
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index 02f95704b..d33d1c01f 100644
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ b/docker/cinder/cinder-base/Dockerfile.j2
@@ -28,8 +28,11 @@ RUN yum -y install lvm2 \
 
      {% elif base_distro in ['ubuntu', 'debian'] %}
 
-RUN apt-get install -y --no-install-recommends lvm2 \
-   && apt-get clean
+RUN apt-get install -y --no-install-recommends \
+        lvm2 \
+        ceph-common \
+    && apt-get clean \
+    && mkdir -p /etc/ceph
 
     {% endif %}
 
diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2
index bce7c1779..ef5fcfb39 100644
--- a/docker/glance/glance-base/Dockerfile.j2
+++ b/docker/glance/glance-base/Dockerfile.j2
@@ -19,6 +19,15 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
 
     {% endif %}
 {% elif install_type == 'source' %}
+    {% if base_distro in ['ubuntu', 'debian'] %}
+
+RUN apt-get install -y --no-install-recommends \
+        python-rbd \
+        python-rados \
+    && apt-get clean \
+    && mkdir -p /etc/ceph/
+
+    {% endif %}
 
 ADD glance-base-archive /glance-base-source
 RUN ln -s glance-base-source/* glance \
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index f1b5b95b7..26890dd66 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -22,8 +22,11 @@ RUN yum -y install \
 
     {% elif base_distro in ['ubuntu', 'debian'] %}
 
-RUN apt-get install -y --no-install-recommends qemu-utils \
-    && apt-get clean
+RUN apt-get install -y --no-install-recommends \
+        qemu-utils \
+        ceph-common \
+    && apt-get clean \
+    && mkdir -p /etc/ceph
 
     {% endif %}
 {% endif %}
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index a238625c5..f296eb55c 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/Dockerfile.j2
@@ -15,12 +15,15 @@ RUN yum -y install \
 {% elif base_distro in ['ubuntu', 'debian'] %}
 
 RUN apt-get install -y --no-install-recommends \
+        ceph-common \
         libvirt-bin \
         dmidecode \
         pm-utils \
         qemu \
+        qemu-block-extra \
         ebtables \
-    && apt-get clean
+    && apt-get clean \
+    && mkdir -p /etc/ceph
 
 {% endif %}
 
diff --git a/docker/nova/nova-libvirt/start.sh b/docker/nova/nova-libvirt/start.sh
index aa07f62dd..6191ce851 100755
--- a/docker/nova/nova-libvirt/start.sh
+++ b/docker/nova/nova-libvirt/start.sh
@@ -8,12 +8,5 @@ source /opt/kolla/kolla-common.sh
 python /opt/kolla/set_configs.py
 CMD=$(cat /run_command)
 
-# TODO(SamYaple): Tweak libvirt.conf rather than change permissions.
-# Fix permissions for libvirt
-if [[ -c /dev/kvm ]]; then
-    chmod 660 /dev/kvm
-    chown root:kvm /dev/kvm
-fi
-
 echo "Running command: ${CMD}"
 exec $CMD