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/keystone | |
| 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/keystone')
| -rw-r--r-- | docker/keystone/keystone-base/Dockerfile.j2 | 27 | ||||
| -rw-r--r-- | docker/keystone/keystone/Dockerfile.j2 | 13 |
2 files changed, 35 insertions, 5 deletions
diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index a9160478a..85d98a834 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-base/Dockerfile.j2 @@ -14,11 +14,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'mod_auth_mellon', 'mod_auth_openidc', 'mod_ssl', + 'openstack-keystone' + ] %} + + {% if distro_python_version.startswith('3') %} + {% set keystone_base_packages = keystone_base_packages + [ + 'python3-keystoneclient', + 'python3-ldappool', + 'python3-mod_wsgi' + ] %} + {% else %} + {% set keystone_base_packages = keystone_base_packages + [ 'mod_wsgi', - 'openstack-keystone', - 'python2-ldappool', - 'python-keystoneclient' + 'python-keystoneclient', + 'python2-ldappool' ] %} + {% endif %} {{ macros.install_packages(keystone_base_packages | customizable("packages")) }} RUN mkdir -p /var/www/cgi-bin/keystone \ @@ -52,9 +63,19 @@ RUN mkdir -p /var/www/cgi-bin/keystone \ 'mod_auth_mellon', 'mod_auth_openidc', 'mod_ssl', + ] %} + {% if distro_python_version.startswith('3') %} + {% set keystone_base_packages = keystone_base_packages + [ + 'python3-ldappool', + 'python3-mod_wsgi' + ] %} + {% else %} + {% set keystone_base_packages = keystone_base_packages + [ 'mod_wsgi', 'python2-ldappool' ] %} + {% endif %} + {{ macros.install_packages(keystone_base_packages | customizable("packages")) }} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2 index bbcea3c63..2dbe71ad0 100644 --- a/docker/keystone/keystone/Dockerfile.j2 +++ b/docker/keystone/keystone/Dockerfile.j2 @@ -13,9 +13,18 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bo # TODO: oraclelinux fails to install these packages. Should be added when this is fixed. {% if base_package_type == 'rpm' and base_distro != 'oraclelinux' %} {% set keystone_packages = [ - 'mod_auth_gssapi', - 'python-requests-kerberos', + 'mod_auth_gssapi' + ] %} + + {% if distro_python_version.startswith('3') %} + {% set keystone_packages = keystone_packages + [ + 'python3-requests-kerberos' + ] %} + {% else %} + {% set keystone_packages = keystone_packages + [ + 'python-requests-kerberos' ] %} + {% endif %} {% elif base_package_type == 'deb' %} {% set keystone_packages = [ 'libapache2-mod-auth-gssapi', |