aboutsummaryrefslogtreecommitdiff
path: root/docker/nova/nova-compute
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-01-30 20:13:03 +0000
committerGerrit Code Review <review@openstack.org>2020-01-30 20:13:03 +0000
commite97239f03e734195a49b383f0e77aae3bdea9a35 (patch)
tree6e642b2c4dc807e60d5b3ba84d0d5defa6b9a8ca /docker/nova/nova-compute
parent63ad9cd0de0926f401a7f26bff505b1629f2e520 (diff)
parent4b4e26262b9e03190c639481fb60a8f4f92c532a (diff)
downloadkolla-e97239f03e734195a49b383f0e77aae3bdea9a35.tar.gz
kolla-e97239f03e734195a49b383f0e77aae3bdea9a35.zip
Merge "CentOS 8: Update packages in images"
Diffstat (limited to 'docker/nova/nova-compute')
-rw-r--r--docker/nova/nova-compute/Dockerfile.j226
1 files changed, 22 insertions, 4 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index a8e103694..ff41c0fbe 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -83,18 +83,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' %}