diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-03-09 17:44:54 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-04-15 09:32:06 +0000 |
| commit | 53443c5c712f4ec23b859105e94bcd90abc27762 (patch) | |
| tree | 5bc6d8db4c65519e16d231b55f574e813e29da4b /docker/gnocchi | |
| parent | a176c6e080be2e71829e8ca5e8b330fdda70038a (diff) | |
| download | kolla-53443c5c712f4ec23b859105e94bcd90abc27762.tar.gz kolla-53443c5c712f4ec23b859105e94bcd90abc27762.zip | |
Remove support for CentOS 7
With the move to RHEL/CentOS 8 we no longer have Python 2 in our images
so there is no need for checking which Python version (2.x or 3.x) is
used inside of containers.
We also no longer have to support yum as a value for
distro_package_manager.
Partially-Implements: blueprint centos-rhel-8
Change-Id: Ie45cf3465fedddbde7856961527421883ba3d5c9
Diffstat (limited to 'docker/gnocchi')
| -rw-r--r-- | docker/gnocchi/gnocchi-base/Dockerfile.j2 | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index 487c70a35..f88fe6bdd 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -13,10 +13,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} - {# NOTE(mgoddard): EPEL required for python3-boto3 package on CentOS 8 #} - {% if distro_package_manager == 'dnf' %} - {{ macros.enable_extra_repos(['epel']) }} - {% endif %} +{# NOTE(mgoddard): EPEL required for python3-boto3 package on CentOS 8 #} +{{ macros.enable_extra_repos(['epel']) }} {% if base_package_type == 'rpm' %} @@ -24,22 +22,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'gnocchi-common', 'httpd', 'mod_ssl', - ] %} - {% if distro_python_version.startswith('3') %} - {% set gnocchi_base_packages = gnocchi_base_packages + [ 'python3-boto3', 'python3-cradox', 'python3-ldappool', 'python3-mod_wsgi' ] %} - {% else %} - {% set gnocchi_base_packages = gnocchi_base_packages + [ - 'mod_wsgi', - 'python-boto3', - 'python2-cradox', - 'python2-ldappool' - ] %} - {% endif %} {{ macros.install_packages(gnocchi_base_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 @@ -74,19 +61,9 @@ RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages 'httpd', 'librados2-devel', 'mod_ssl', - ] %} - {% if distro_python_version.startswith('3') %} - {% set gnocchi_base_packages = gnocchi_base_packages + [ 'python3-ldappool', 'python3-mod_wsgi' ] %} - {% else %} - {% set gnocchi_base_packages = gnocchi_base_packages + [ - 'mod_wsgi', - 'python2-ldappool' - ] %} - {% endif %} - # on x86-64 pip grabs precompiled numpy/scipy - on aarch64/ppc64le # it needs to be built |