diff options
Diffstat (limited to 'docker/nova/nova-libvirt')
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 12ca843ef..293020d60 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -18,18 +18,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'libvirt-client', 'libvirt-daemon', 'libvirt-daemon-config-nwfilter', - 'libvirt-daemon-driver-lxc', 'libvirt-daemon-driver-nwfilter', 'openvswitch', 'trousers' ] %} - {% if base_distro in ['centos'] %} + {% if distro_package_manager == 'dnf' or base_distro not in ['centos'] %} {% set nova_libvirt_packages = nova_libvirt_packages + [ - 'qemu-kvm-ev' + 'qemu-kvm' ] %} {% else %} {% set nova_libvirt_packages = nova_libvirt_packages + [ - 'qemu-kvm' + 'qemu-kvm-ev' + ] %} + {% endif %} + {% if distro_package_manager != 'dnf' %} + {% set nova_libvirt_packages = nova_libvirt_packages + [ + 'libvirt-daemon-driver-lxc', ] %} {% endif %} |
