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/ironic | |
| 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/ironic')
| -rw-r--r-- | docker/ironic/ironic-api/Dockerfile.j2 | 12 | ||||
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 28 | ||||
| -rw-r--r-- | docker/ironic/ironic-pxe/Dockerfile.j2 | 6 |
3 files changed, 37 insertions, 9 deletions
diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2 index f7d391cb2..bd8667192 100644 --- a/docker/ironic/ironic-api/Dockerfile.j2 +++ b/docker/ironic/ironic-api/Dockerfile.j2 @@ -10,9 +10,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set ironic_api_packages = [ 'httpd', 'mod_ssl', - 'mod_wsgi', 'openstack-ironic-api' ] %} + {% if distro_python_version.startswith('3') %} + {% set ironic_api_packages = ironic_api_packages + ['python3-mod_wsgi'] %} + {% else %} + {% set ironic_api_packages = ironic_api_packages + ['mod_wsgi'] %} + {% endif %} {% elif base_package_type == 'deb' %} {% set ironic_api_packages = [ 'apache2', @@ -26,8 +30,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set ironic_api_packages = [ 'httpd', 'mod_ssl', - 'mod_wsgi' ] %} + {% if distro_python_version.startswith('3') %} + {% set ironic_api_packages = ironic_api_packages + ['python3-mod_wsgi'] %} + {% else %} + {% set ironic_api_packages = ironic_api_packages + ['mod_wsgi'] %} + {% endif %} {% elif base_package_type == 'deb' %} {% set ironic_api_packages = [ 'apache2', diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 720eb4bfd..811a8102d 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -18,19 +18,35 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openstack-ironic-staging-drivers', 'parted', 'psmisc', + 'shellinabox', + 'util-linux', + 'xfsprogs' + ] %} + + {% if distro_python_version.startswith('3') %} + {% set ironic_conductor_packages = ironic_conductor_packages + [ + 'ansible-python3', + 'python3-dracclient', + 'python3-ironic-inspector-client', + 'python3-proliantutils', + 'python3-pysnmp', + 'python3-scciclient', + 'python3-sushy', + 'python3-systemd' + ] %} + {% else %} + {% set ironic_conductor_packages = ironic_conductor_packages + [ 'pysnmp', - 'python2-ImcSdk', + 'python-UcsSdk', 'python-dracclient', 'python-ironic-inspector-client', 'python-proliantutils', 'python-scciclient', 'python-sushy', - 'python-UcsSdk', - 'shellinabox', - 'systemd-python', - 'util-linux', - 'xfsprogs', + 'python2-ImcSdk', + 'systemd-python' ] %} + {% endif %} {% if base_distro in ['centos', 'oraclelinux'] %} {% set ironic_conductor_packages = ironic_conductor_packages + [ 'qemu-img-ev' diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index 3b6937917..00a7e77ec 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -10,9 +10,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'httpd', 'ipxe-bootimgs', 'mod_ssl', - 'mod_wsgi', 'tftp-server' ] %} + {% if distro_python_version.startswith('3') %} + {% set ironic_pxe_packages = ironic_pxe_packages + ['python3-mod_wsgi'] %} + {% else %} + {% set ironic_pxe_packages = ironic_pxe_packages + ['mod_wsgi'] %} + {% endif %} {% if base_arch == 'x86_64' %} {% set ironic_pxe_packages = ironic_pxe_packages + [ |