aboutsummaryrefslogtreecommitdiff
path: root/docker_templates/nova/nova-libvirt
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-24 18:42:05 +0000
committerGerrit Code Review <review@openstack.org>2015-08-24 18:42:05 +0000
commit7c83b0e5b977ed66b1c66ed044b6baf80e4bd54d (patch)
tree562514aed0715ad5710cfb0663dc58ea9d4cea2e /docker_templates/nova/nova-libvirt
parentf248eafdfda544ed2c9d6a6bcf9a54a53de33c5e (diff)
parenta070839b1f61e1cdd7bbcb0b943cd1683f19f093 (diff)
downloadkolla-7c83b0e5b977ed66b1c66ed044b6baf80e4bd54d.tar.gz
kolla-7c83b0e5b977ed66b1c66ed044b6baf80e4bd54d.zip
Merge "Ubuntu - Nova"
Diffstat (limited to 'docker_templates/nova/nova-libvirt')
-rw-r--r--docker_templates/nova/nova-libvirt/Dockerfile.j212
1 files changed, 10 insertions, 2 deletions
diff --git a/docker_templates/nova/nova-libvirt/Dockerfile.j2 b/docker_templates/nova/nova-libvirt/Dockerfile.j2
index 691ec8133..29e0843c3 100644
--- a/docker_templates/nova/nova-libvirt/Dockerfile.j2
+++ b/docker_templates/nova/nova-libvirt/Dockerfile.j2
@@ -12,11 +12,19 @@ RUN yum -y install \
libvirt-daemon-driver-lxc \
&& yum clean all
+{% elif base_distro in ['ubuntu', 'debian'] %}
+
+RUN apt-get install -y --no-install-recommends \
+ libvirt-bin \
+ dmidecode \
+ pm-utils \
+ qemu \
+ ebtables \
+ && apt-get clean
+
{% endif %}
COPY start.sh /
COPY config-external.sh /opt/kolla/
-VOLUME [ "/sys/fs/cgroup" ]
-
CMD ["/start.sh"]