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/cloudkitty/cloudkitty-api/Dockerfile.j2 | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'docker/cloudkitty/cloudkitty-api') diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 index 148ce9871..95656dbc7 100644 --- a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 +++ b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 @@ -11,9 +11,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set cloudkitty_api_packages = [ 'httpd', 'mod_ssl', - 'mod_wsgi', - 'openstack-cloudkitty-api', + 'openstack-cloudkitty-api' ] %} + {% if distro_python_version.startswith('3') %} + {% set cloudkitty_api_packages = cloudkitty_api_packages + ['python3-mod_wsgi'] %} + {% else %} + {% set cloudkitty_api_packages = cloudkitty_api_packages + ['mod_wsgi'] %} + {% endif %} {{ macros.install_packages(cloudkitty_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 @@ -31,8 +35,12 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% set cloudkitty_api_packages = [ 'httpd', 'mod_ssl', - 'mod_wsgi' ] %} + {% if distro_python_version.startswith('3') %} + {% set cloudkitty_api_packages = cloudkitty_api_packages + ['python3-mod_wsgi'] %} + {% else %} + {% set cloudkitty_api_packages = cloudkitty_api_packages + ['mod_wsgi'] %} + {% endif %} {{ macros.install_packages(cloudkitty_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