diff options
| author | Mark Goddard <mark@stackhpc.com> | 2019-12-17 13:01:42 +0000 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-02-26 09:16:48 +0000 |
| commit | 63d566feaafd0cab6eeac9f88acd6ec7fc66b645 (patch) | |
| tree | 456f87f77a33c633532dcc1065dd632e0ed614ce /docker/nova | |
| parent | 4b35eb5e241147fb38cf81a11ba63b6ac7c77f90 (diff) | |
| download | kolla-63d566feaafd0cab6eeac9f88acd6ec7fc66b645.tar.gz kolla-63d566feaafd0cab6eeac9f88acd6ec7fc66b645.zip | |
CentOS 8: Update packages in images
* Some further changes for python2 vs python3 packages
* Allow rabbitmq 3.7.*, since a newer erlang is available
* Switch from qemu-img-ev to qemu-img on CentOS 8
* bridge-utils no longer available on CentOS 8
* libvirt-daemon-driver-lxc no longer available on CentOS 8
* Mark some more images buildable for CentOS 8
Depends-On: https://review.opendev.org/709553
Change-Id: Iaf5b68ff6d944ae730ca0b1d5832172c106a6c08
Partially-Implements: blueprint centos-rhel-8
Partially-Implements: blueprint centos-rhel-python-3
(cherry picked from commit 4b4e26262b9e03190c639481fb60a8f4f92c532a)
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 26 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 12 | ||||
| -rw-r--r-- | docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 11 |
3 files changed, 40 insertions, 9 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index c22b76b2c..ba846e6be 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -81,18 +81,36 @@ RUN rm -f /etc/nova/nova-compute.conf 'e2fsprogs', 'genisoimage', 'iscsi-initiator-utils', - 'libvirt-python', 'libosinfo', 'nfs-utils', 'openvswitch', 'parted', - 'python-libguestfs', - 'python-rtslib', - 'qemu-img-ev', 'sysfsutils', 'targetcli', 'xfsprogs' ] %} + {% if distro_python_version.startswith('3') %} + {% set nova_compute_packages = nova_compute_packages + [ + 'python3-libguestfs', + 'python3-libvirt', + 'python3-rtslib' + ] %} + {% else %} + {% set nova_compute_packages = nova_compute_packages + [ + 'libvirt-python', + 'python-libguestfs', + 'python-rtslib' + ] %} + {% endif %} + {% if distro_package_manager == 'dnf' %} + {% set nova_compute_packages = nova_compute_packages + [ + 'qemu-img', + ] %} + {% else %} + {% set nova_compute_packages = nova_compute_packages + [ + 'qemu-img-ev', + ] %} + {% endif %} {% elif base_package_type == 'deb' %} diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 1e74ba645..d18ec09bd 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -16,18 +16,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 %} diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 index 57b439766..b5da34c12 100644 --- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -36,10 +36,19 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set nova_spicehtml5proxy_packages = [ - 'numpy', 'spice-html5' ] %} + {% if distro_python_version.startswith('3') %} + {% set nova_spicehtml5proxy_packages = nova_spicehtml5proxy_packages + [ + 'python3-numpy', + ] %} + {% else %} + {% set nova_spicehtml5proxy_packages = nova_spicehtml5proxy_packages + [ + 'numpy', + ] %} + {% endif %} + {% elif base_package_type == 'deb' %} {% set nova_spicehtml5proxy_packages = [ |
