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/vitrage | |
| 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/vitrage')
| -rw-r--r-- | docker/vitrage/vitrage-api/Dockerfile.j2 | 14 | ||||
| -rw-r--r-- | docker/vitrage/vitrage-base/Dockerfile.j2 | 12 |
2 files changed, 23 insertions, 3 deletions
diff --git a/docker/vitrage/vitrage-api/Dockerfile.j2 b/docker/vitrage/vitrage-api/Dockerfile.j2 index e9b9a9fe9..169f75fdf 100644 --- a/docker/vitrage/vitrage-api/Dockerfile.j2 +++ b/docker/vitrage/vitrage-api/Dockerfile.j2 @@ -11,12 +11,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set vitrage_api_packages = [ 'httpd', - 'mod_wsgi', 'mod_ssl', - 'python2-ldappool', 'openstack-vitrage-api' ] %} + {% if distro_python_version.startswith('3') %} + {% set vitrage_api_packages = vitrage_api_packages + [ + 'python3-ldappool', + 'python3-mod_wsgi' + ] %} + {% else %} + {% set vitrage_api_packages = vitrage_api_packages + [ + 'mod_wsgi', + 'python2-ldappool' + ] %} + {% endif %} + {{ macros.install_packages(vitrage_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/vitrage/vitrage-base/Dockerfile.j2 b/docker/vitrage/vitrage-base/Dockerfile.j2 index fb9acf2dd..2e60607e0 100644 --- a/docker/vitrage/vitrage-base/Dockerfile.j2 +++ b/docker/vitrage/vitrage-base/Dockerfile.j2 @@ -33,10 +33,20 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% set vitrage_base_packages = [ 'httpd', - 'mod_wsgi', 'mod_ssl', + ] %} + {% if distro_python_version.startswith('3') %} + {% set vitrage_base_packages = vitrage_base_packages + [ + 'python3-ldappool', + 'python3-mod_wsgi' + ] %} + {% else %} + {% set vitrage_base_packages = vitrage_base_packages + [ + 'mod_wsgi', 'python2-ldappool' ] %} + {% endif %} + {{ macros.install_packages(vitrage_base_packages | customizable("packages")) }} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ |