From 617421fb380f8b26531c4c4ac78b65a3f5a135ec Mon Sep 17 00:00:00 2001 From: abraden Date: Mon, 7 Dec 2020 19:20:44 +0000 Subject: Support CentOS 8.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport this until Train. CentOS 8.3 renamed system repos. [1] This caused failures when disabling and enabling. More details in the referenced bug report. Notice CentOS 8.2 and below will no longer work. Train backport also includes some fixes for the fallout from the new pip resolver. * cap bandit<1.6.3, since bandit no longer supports Python 2. * mark kuryr-libnetwork unbuildable for source images. * mark almanach-base & dragonflow-base unbuildable for Debian & Ubuntu source images. * Don't install networking-hyperv in source neutron-server images. pip complains of a conflict. (https://bugs.launchpad.net/kolla/+bug/1907826) [1] https://wiki.centos.org/Manuals/ReleaseNotes/CentOS8.2011#Yum_repo_file_and_repoid_changes Change-Id: I2d67b3ed7b7c521bc755ec9a87365c9962a9eeff Closes-Bug: #1907213 Closes-Bug: #1907826 Co-Authored-By: Radosław Piliszek Depends-On: https://review.opendev.org/766211 Depends-On: https://review.opendev.org/767157 --- docker/base/Dockerfile.j2 | 4 ++-- docker/neutron/neutron-server/Dockerfile.j2 | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'docker') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 89e0ac874..d2f21a99e 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -244,8 +244,8 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 'dnf-plugins-core' ] %} {% set base_centos_yum_repos_to_enable = [ - 'HighAvailability', - 'PowerTools' + 'ha', + 'powertools' ] %} # NOTE(yoctozepto): use upstream rabbitmq (3.7) and erlang on CentOS 8 # see https://launchpad.net/bugs/1884034 diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index 8a27a98b5..a2bac08f4 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -34,9 +34,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif install_type == 'source' %} - {% set neutron_server_pip_packages = [ - '"networking-hyperv>=5.0.0,<6.0.0"' - ] %} + {% set neutron_server_pip_packages = [] %} {% set neutron_server_plugins_pip_packages = [ '/plugins/*' -- cgit v1.2.3