openstack
/
kolla
Code Issues Proposed changes

Merge "Install libvirt-clients for nova-libvirt image"

This commit is contained in:
Zuul 2017-11-21 11:25:52 +00:00 committed by Gerrit Code Review
parent d6b1cee0fe 8c1c03f160
commit 3be0256d67
1 changed files with 26 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
docker/nova/nova-libvirt/Dockerfile.j2
View File

@ -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,32 +21,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'qemu-kvm'
] %}
{% elif base_distro in ['ubuntu'] %}
{% set nova_libvirt_packages = [
'ceph-common',
'ebtables',
'libvirt-bin',
'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'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set nova_libvirt_packages = [
'ceph-common',
@ -55,23 +31,38 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openvswitch-switch',
'pm-utils',
'qemu',
'qemu-block-extra',
'usermode'
'qemu-block-extra'
] %}
{% if base_arch != "ppc64le" %}
{% set nova_libvirt_packages = nova_libvirt_packages + [
'dmidecode',
'xen-utils-4.8'
] %}
{% endif %}
{% if base_arch == "aarch64" %}
{% set nova_libvirt_packages = nova_libvirt_packages + [
'qemu-efi'
] %}
{% endif %}
{% if base_arch != "ppc64le" %}
{% set nova_libvirt_packages = nova_libvirt_packages + [
'dmidecode',
'xen-utils-4.6'
] %}
{% endif %}
{% if base_distro in ['debian'] %}
{% set nova_libvirt_packages = nova_libvirt_packages + [
'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")) }}