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/panko | |
| 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/panko')
| -rw-r--r-- | docker/panko/panko-api/Dockerfile.j2 | 11 | ||||
| -rw-r--r-- | docker/panko/panko-base/Dockerfile.j2 | 21 |
2 files changed, 2 insertions, 30 deletions
diff --git a/docker/panko/panko-api/Dockerfile.j2 b/docker/panko/panko-api/Dockerfile.j2 index 6816a400e..1d1d56062 100644 --- a/docker/panko/panko-api/Dockerfile.j2 +++ b/docker/panko/panko-api/Dockerfile.j2 @@ -10,18 +10,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_package_type == 'rpm' %} {% set panko_api_packages = [ - 'openstack-panko-api' - ] %} - - {% if distro_python_version.startswith('3') %} - {% set panko_api_packages = panko_api_packages + [ + 'openstack-panko-api', 'python3-pymongo' ] %} - {% else %} - {% set panko_api_packages = panko_api_packages + [ - 'python-pymongo' - ] %} - {% endif %} {% elif base_package_type == 'deb' %} {% set panko_api_packages = [ 'panko-api', diff --git a/docker/panko/panko-base/Dockerfile.j2 b/docker/panko/panko-base/Dockerfile.j2 index 48d90ccb4..1504b2a54 100644 --- a/docker/panko/panko-base/Dockerfile.j2 +++ b/docker/panko/panko-base/Dockerfile.j2 @@ -15,20 +15,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set panko_base_packages = [ 'httpd', 'mod_ssl', - 'openstack-panko-common' - ] %} - - {% if distro_python_version.startswith('3') %} - {% set panko_base_packages = panko_base_packages + [ + 'openstack-panko-common', 'python3-ldappool', 'python3-mod_wsgi' ] %} - {% else %} - {% set panko_base_packages = panko_base_packages + [ - 'mod_wsgi', - 'python2-ldappool' - ] %} - {% endif %} {{ macros.install_packages(panko_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 @@ -46,18 +36,9 @@ RUN echo > /etc/apache2/ports.conf {% set panko_base_packages = [ 'httpd', 'mod_ssl', - ] %} - {% if distro_python_version.startswith('3') %} - {% set panko_base_packages = panko_base_packages + [ 'python3-ldappool', 'python3-mod_wsgi' ] %} - {% else %} - {% set panko_base_packages = panko_base_packages + [ - 'mod_wsgi', - 'python2-ldappool' - ] %} - {% endif %} {{ macros.install_packages(panko_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 |