diff options
| author | Alex Schultz <aschultz@redhat.com> | 2019-01-21 12:58:19 -0700 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2019-03-12 17:48:18 +0000 |
| commit | 3e5d8e2653db1c6c28cb428f81cd0bc332c623c3 (patch) | |
| tree | 25de124db6ae7848cecb121ac414eb468bfd4d5c /docker/tripleoclient | |
| parent | 8df6eb01184672ffdc752437ea4d98d13f16026e (diff) | |
| download | kolla-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/tripleoclient')
| -rw-r--r-- | docker/tripleoclient/Dockerfile.j2 | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/docker/tripleoclient/Dockerfile.j2 b/docker/tripleoclient/Dockerfile.j2 index f4ad80d00..b47eff638 100644 --- a/docker/tripleoclient/Dockerfile.j2 +++ b/docker/tripleoclient/Dockerfile.j2 @@ -7,18 +7,27 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_package_type == 'rpm' %} - {% set tripleoclient_packages = [ - 'python-ipaddr', - 'python-openstackclient', - 'python-tripleoclient', - 'puppet-tripleo', - 'openstack-tripleo-validations', 'e2fsprogs', - 'xfsprogs', + 'git', 'openssh-clients', - 'git' + 'openstack-tripleo-validations', + 'puppet-tripleo', + 'xfsprogs' + ] %} + + {% if distro_python_version.startswith('3') %} + {% set tripleoclient_packages = tripleoclient_packages + [ + 'python3-openstackclient', + 'python3-tripleoclient' + ] %} + {% else %} + {% set tripleoclient_packages = tripleoclient_packages + [ + 'python-ipaddr', + 'python-openstackclient', + 'python-tripleoclient' ] %} + {% endif %} {{ macros.install_packages(tripleoclient_packages | customizable("packages")) }} |