From 3e5d8e2653db1c6c28cb428f81cd0bc332c623c3 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 21 Jan 2019 12:58:19 -0700 Subject: 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 --- docker/nova/nova-api/Dockerfile.j2 | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'docker/nova/nova-api') diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index 2bd2a0cfb..9024d9387 100644 --- a/docker/nova/nova-api/Dockerfile.j2 +++ b/docker/nova/nova-api/Dockerfile.j2 @@ -11,9 +11,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set nova_api_packages = [ 'httpd', 'mod_ssl', - 'mod_wsgi', 'openstack-nova-api' ] %} + {% if distro_python_version.startswith('3') %} + {% set nova_api_packages = nova_api_packages + ['python3-mod_wsgi'] %} + {% else %} + {% set nova_api_packages = nova_api_packages + ['mod_wsgi'] %} + {% endif %} + {{ macros.install_packages(nova_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 @@ -38,8 +43,13 @@ RUN echo > /etc/apache2/ports.conf {% set nova_api_packages = [ 'httpd', 'mod_ssl', - 'mod_wsgi' ] %} + {% if distro_python_version.startswith('3') %} + {% set nova_api_packages = nova_api_packages + ['python3-mod_wsgi'] %} + {% else %} + {% set nova_api_packages = nova_api_packages + ['mod_wsgi'] %} + {% endif %} + {{ macros.install_packages(nova_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 -- cgit v1.2.3