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/aodh | |
| 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/aodh')
| -rw-r--r-- | docker/aodh/aodh-base/Dockerfile.j2 | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2 index a54cbd76b..6c5d7f571 100644 --- a/docker/aodh/aodh-base/Dockerfile.j2 +++ b/docker/aodh/aodh-base/Dockerfile.j2 @@ -10,17 +10,28 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_package_type == 'rpm' %} + {# NOTE(aschultz): added api because the common package doesn't include the wsgi file. I think this needs fixing #} {% set aodh_base_packages = [ 'httpd', 'mod_ssl', + 'openstack-aodh-api', + 'openstack-aodh-common' + ] %} + {% if distro_python_version.startswith('3') %} + {% set aodh_base_packages = aodh_base_packages + [ + 'python3-ldappool', + 'python3-mod_wsgi' + ] %} + {% else %} + {% set aodh_base_packages = aodh_base_packages + [ 'mod_wsgi', - 'openstack-aodh-common', 'python2-ldappool' ] %} + {% endif %} {{ macros.install_packages(aodh_base_packages | customizable("packages")) }} RUN mkdir -p /var/www/cgi-bin/aodh \ - && cp -a /usr/lib/python2.7/site-packages/aodh/api/app.wsgi /var/www/cgi-bin/aodh/ \ + && cp -a /usr/bin/aodh-api /var/www/cgi-bin/aodh/ \ && 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 {% elif base_package_type == 'deb' %} @@ -44,10 +55,20 @@ RUN mkdir -p /var/www/cgi-bin/aodh \ {% set aodh_base_packages = [ 'httpd', - 'mod_wsgi', 'mod_ssl', + ] %} + {% if distro_python_version.startswith('3') %} + {% set aodh_base_packages = aodh_base_packages + [ + 'python3-ldappool', + 'python3-mod_wsgi' + ] %} + {% else %} + {% set aodh_base_packages = aodh_base_packages + [ + 'mod_wsgi', 'python2-ldappool' ] %} + {% endif %} + {{ macros.install_packages(aodh_base_packages | customizable("packages")) }} RUN mkdir -p /var/www/cgi-bin/aodh \ |