diff options
| author | Zuul <zuul@review.openstack.org> | 2017-11-21 11:25:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-11-21 11:25:52 +0000 |
| commit | 3be0256d67362c13f71fcf9534a9e43caa926c78 (patch) | |
| tree | c34e1df291d59273816e0836de12194b811fd620 | |
| parent | d6b1cee0fe50ef2c70714b2ae3083d8a688d056d (diff) | |
| parent | 8c1c03f1605427ace1eddd0f4f81f68dbbf48593 (diff) | |
| download | kolla-3be0256d67362c13f71fcf9534a9e43caa926c78.tar.gz kolla-3be0256d67362c13f71fcf9534a9e43caa926c78.zip | |
Merge "Install libvirt-clients for nova-libvirt image"
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 45 |
1 files changed, 18 insertions, 27 deletions
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index d3d7a2d20..edd4d506b 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -12,6 +12,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set nova_libvirt_packages = [ 'ceph-common', 'libguestfs', + 'libvirt-client', 'libvirt-daemon', 'libvirt-daemon-config-nwfilter', 'libvirt-daemon-driver-lxc', @@ -20,58 +21,48 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'qemu-kvm' ] %} -{% elif base_distro in ['ubuntu'] %} +{% elif base_distro in ['debian', 'ubuntu'] %} {% set nova_libvirt_packages = [ 'ceph-common', 'ebtables', - 'libvirt-bin', + 'libvirt-clients', + 'libvirt-daemon-system', 'openvswitch-switch', 'pm-utils', 'qemu', 'qemu-block-extra' ] %} - {% if base_arch != "ppc64le" %} - {% set nova_libvirt_packages = nova_libvirt_packages + [ - 'dmidecode', - 'xen-utils-4.6' - ] %} - {% endif %} - {% if base_arch == "aarch64" %} {% set nova_libvirt_packages = nova_libvirt_packages + [ 'qemu-efi' ] %} {% endif %} -{% elif base_distro in ['debian'] %} - - {% set nova_libvirt_packages = [ - 'ceph-common', - 'ebtables', - 'libvirt-clients', - 'libvirt-daemon-system', - 'openvswitch-switch', - 'pm-utils', - 'qemu', - 'qemu-block-extra', - 'usermode' - ] %} - {% if base_arch != "ppc64le" %} {% set nova_libvirt_packages = nova_libvirt_packages + [ 'dmidecode', - 'xen-utils-4.8' + 'xen-utils-4.6' ] %} {% endif %} - {% if base_arch == "aarch64" %} + {% if base_distro in ['debian'] %} {% set nova_libvirt_packages = nova_libvirt_packages + [ - 'qemu-efi' + 'usermode' ] %} + {% if base_arch != "ppc64le" %} + {% set nova_libvirt_packages = nova_libvirt_packages + [ + 'xen-utils-4.8' + ] %} + {% endif %} + {% elif base_distro in ['ubuntu'] %} + {% if base_arch != "ppc64le" %} + {% set nova_libvirt_packages = nova_libvirt_packages + [ + 'xen-utils-4.6' + ] %} + {% endif %} {% endif %} - {% endif %} {{ macros.install_packages(nova_libvirt_packages | customizable("packages")) }} |