aboutsummaryrefslogtreecommitdiff
path: root/docker/nova/nova-compute
diff options
context:
space:
mode:
authorAlex Schultz <aschultz@redhat.com>2019-01-21 12:58:19 -0700
committerMark Goddard <mark@stackhpc.com>2019-03-12 17:48:18 +0000
commit3e5d8e2653db1c6c28cb428f81cd0bc332c623c3 (patch)
tree25de124db6ae7848cecb121ac414eb468bfd4d5c /docker/nova/nova-compute
parent8df6eb01184672ffdc752437ea4d98d13f16026e (diff)
downloadkolla-3e5d8e2653db1c6c28cb428f81cd0bc332c623c3.tar.gz
kolla-3e5d8e2653db1c6c28cb428f81cd0bc332c623c3.zip
Add python3 packages for RHEL systems
RDO is currently working on python3 support for the next version of CentOS/RHEL based systems. This package uses the distro_python3 flag that was added as part of I4028991bad92c0e8e21066cc4173c06ce5eba393 to use the python3 specific package names. This change only adds python3 package names for RHEL systems. Conflicts-With: https://review.openstack.org/#/c/636457/ Change-Id: Iad6b70b433a0dd1b0f8ae6790fd280594517661a Related-Blueprint: python3-support
Diffstat (limited to 'docker/nova/nova-compute')
-rw-r--r--docker/nova/nova-compute/Dockerfile.j217
1 files changed, 14 insertions, 3 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index 03741d034..8f58e2b74 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -19,13 +19,24 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openstack-nova-compute',
'openvswitch',
'parted',
- 'python-libguestfs',
- 'python-oslo-vmware',
- 'python-rtslib',
'sysfsutils',
'targetcli'
] %}
+ {% if distro_python_version.startswith('3') %}
+ {% set nova_compute_packages = nova_compute_packages + [
+ 'python3-libguestfs',
+ 'python3-oslo-vmware',
+ 'python3-rtslib'
+ ] %}
+ {% else %}
+ {% set nova_compute_packages = nova_compute_packages + [
+ 'python-libguestfs',
+ 'python-oslo-vmware',
+ 'python-rtslib'
+ ] %}
+ {% endif %}
+
{{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
{% elif base_package_type == 'deb' %}