diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-04 13:37:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-04 13:37:55 +0000 |
| commit | c69311b7925adf8ea083215e18d60bccb55bcb18 (patch) | |
| tree | 9d98fd97b201b90ae176af920dcf9ad4ce595df4 | |
| parent | 10f2b59cf0036041e3bcbf5e66df286256fe7309 (diff) | |
| parent | 547a7cf967a38b73a0c1adc752af51eded4a57b3 (diff) | |
| download | kolla-c69311b7925adf8ea083215e18d60bccb55bcb18.tar.gz kolla-c69311b7925adf8ea083215e18d60bccb55bcb18.zip | |
Merge "Make nova-libvirt container build with debian"
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index cc48d0363..ab87a6900 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} MAINTAINER {{ maintainer }} +{% set libvirt_group = 'libvirtd' %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ @@ -17,6 +19,17 @@ RUN yum -y install \ {% elif base_distro in ['ubuntu', 'debian'] %} +{% if base_distro == 'ubuntu' %} +{% set packages = + ' xen-utils-4.6' +%} +{% elif base_distro == 'debian' %} +{% set packages = + ' xen-utils-4.4 usermode' +%} +{% set libvirt_group = 'libvirt' %} +{% endif %} + RUN apt-get -y install --no-install-recommends \ ceph-common \ libvirt-bin \ @@ -25,11 +38,11 @@ RUN apt-get -y install --no-install-recommends \ qemu \ qemu-block-extra \ ebtables \ - xen-utils-4.6 \ + {{ packages }} \ && apt-get clean \ && mkdir -p /etc/ceph \ - && rm /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/autostart/default.xml \ - && usermod -a -G libvirtd nova + && rm -f /etc/libvirt/qemu/networks/default.xml /etc/libvirt/qemu/networks/autostart/default.xml \ + && usermod -a -G {{ libvirt_group }} nova {% endif %} |