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

3 files changed, 37 insertions, 3 deletions

diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2
index ddc493d5b..442e02bde 100644
--- a/docker/cinder/cinder-api/Dockerfile.j2
+++ b/docker/cinder/cinder-api/Dockerfile.j2
@@ -10,9 +10,19 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         {% set cinder_api_packages = [
                 'httpd',
                 'mod_ssl',
+        ] %}
+
+        {% if distro_python_version.startswith('3') %}
+        {% set cinder_api_packages = cinder_api_packages + [
+                'python3-keystone',
+                'python3-mod_wsgi'
+        ] %}
+        {% else %}
+        {% set cinder_api_packages = cinder_api_packages + [
                 'mod_wsgi',
                 'python-keystone'
         ] %}
+        {% endif %}
 {{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
 RUN mkdir -p /var/www/cgi-bin/cinder \
     && cp -a /usr/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi \
@@ -37,8 +47,13 @@ RUN mkdir -p /var/www/cgi-bin/cinder \
         {% set cinder_api_packages = [
                 'httpd',
                 'mod_ssl',
-                'mod_wsgi'
         ] %}
+        {% if distro_python_version.startswith('3') %}
+        {% set cinder_api_packages = cinder_api_packages + ['python3-mod_wsgi'] %}
+        {% else %}
+        {% set cinder_api_packages = cinder_api_packages + ['mod_wsgi'] %}
+        {% endif %}
+
 {{ macros.install_packages(cinder_api_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/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index d8becd4f6..ba9d638f4 100644
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ b/docker/cinder/cinder-base/Dockerfile.j2
@@ -13,10 +13,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
                 'ceph-common',
                 'lvm2',
                 'cryptsetup',
-                'openstack-cinder',
+                'openstack-cinder'
+        ] %}
+
+        {% if distro_python_version.startswith('3') %}
+        {% set cinder_base_packages = cinder_base_packages + [
+                'python3-automaton',
+                'python3-oslo-vmware'
+        ] %}
+        {% else %}
+        {% set cinder_base_packages = cinder_base_packages + [
                 'python-automaton',
                 'python-oslo-vmware'
         ] %}
+        {% endif %}
     {% elif base_package_type == 'deb' %}
         {% set cinder_base_packages = [
                 'ceph-common',
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2
index dc505e5eb..88d7b9be7 100644
--- a/docker/cinder/cinder-volume/Dockerfile.j2
+++ b/docker/cinder/cinder-volume/Dockerfile.j2
@@ -9,11 +9,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% set cinder_volume_packages = [
             'nfs-utils',
             'nvmetcli',
-            'python-rtslib',
             'scsi-target-utils',
             'sysfsutils',
             'targetcli'
     ] %}
+
+    {% if distro_python_version.startswith('3') %}
+    {% set cinder_volume_packages = cinder_volume_packages + [
+            'python3-rtslib',
+    ] %}
+    {% else %}
+    {% set cinder_volume_packages = cinder_volume_packages + [
+            'python-rtslib',
+    ] %}
+    {% endif %}
 {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
 
 {% block cinder_volume_redhat_setup %}