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/designate | |
| 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/designate')
| -rw-r--r-- | docker/designate/designate-base/Dockerfile.j2 | 13 | ||||
| -rw-r--r-- | docker/designate/designate-sink/Dockerfile.j2 | 11 |
2 files changed, 2 insertions, 22 deletions
diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2 index c87e30e31..ccad55d73 100644 --- a/docker/designate/designate-base/Dockerfile.j2 +++ b/docker/designate/designate-base/Dockerfile.j2 @@ -12,22 +12,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_package_type == 'rpm' %} {% set designate_base_packages = [ - 'openstack-designate-common' - ] %} - - {% if distro_python_version.startswith('3') %} - {% set designate_base_packages = designate_base_packages + [ + 'openstack-designate-common', 'python3-oslo-reports', 'python3-suds', 'python3-tooz' ] %} - {% else %} - {% set designate_base_packages = designate_base_packages + [ - 'python-tooz', - 'python2-oslo-reports', - 'python2-suds' - ] %} - {% endif %} {{ macros.install_packages(designate_base_packages | customizable("packages")) }} {% elif base_package_type == 'deb' %} diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2 index 88fb5bda2..07a743c00 100644 --- a/docker/designate/designate-sink/Dockerfile.j2 +++ b/docker/designate/designate-sink/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 designate_sink_packages = [ - 'openstack-designate-sink' - ] %} - - {% if distro_python_version.startswith('3') %} - {% set designate_sink_packages = designate_sink_packages + [ + 'openstack-designate-sink', 'python3-designateclient' ] %} - {% else %} - {% set designate_sink_packages = designate_sink_packages + [ - 'python-designateclient' - ] %} - {% endif %} {% elif base_package_type == 'deb' %} {% set designate_sink_packages = [ 'designate-sink', |