openstack/octavia
Code Issues Proposed changes

Fix centos 8 stream haproxy repository

Browse Source 
Centos 8 stream amphora images were incorrectly using haproxy from
Centos 8 NFV network-extras repo. This repo was deleted and was replaced
by a Centos 8 stream repo.

Change-Id: I5b50ebc5e9443f1a0edd987069d482e03d85e726
This commit is contained in:
Gregory Thiemonge 2022-02-18 11:29:22 +01:00
parent 76e731ad73
commit cc18c1e1b5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
elements/haproxy-octavia/pre-install.d/01-repositories
View File

@ -3,7 +3,7 @@
set -eu set -eu
set -o xtrace set -o xtrace
if [[ "$DISTRO_NAME" == "centos" && "$DIB_RELEASE" == "8" ]]; then if [[ "$DISTRO_NAME" == "centos" && "$DIB_RELEASE" == "8-stream" ]]; then
dnf install -y dnf-plugins-core centos-release-nfv-common dnf install -y dnf-plugins-core centos-release-nfv-common
# REVISIT(cgoncalves): replace arch if-else + GPG with release RPM once available # REVISIT(cgoncalves): replace arch if-else + GPG with release RPM once available
if [[ "$ARCH" =~ (aarch64|arm64) ]]; then if [[ "$ARCH" =~ (aarch64|arm64) ]]; then
@ -16,6 +16,6 @@ if [[ "$DISTRO_NAME" == "centos" && "$DIB_RELEASE" == "8" ]]; then
echo "ERROR: Unsupported architecture $ARCH" echo "ERROR: Unsupported architecture $ARCH"
exit 1 exit 1
fi fi
dnf config-manager --add-repo http://mirror.centos.org/centos/8/nfv/${yum_arch}/network-extras dnf config-manager --add-repo http://mirror.centos.org/centos/$DIB_RELEASE/nfv/${yum_arch}/network-extras
echo gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV >> /etc/yum.repos.d/mirror.centos.org_centos_8_nfv_*_network-extras.repo echo gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV >> /etc/yum.repos.d/mirror.centos.org_centos_${DIB_RELEASE}_nfv_*_network-extras.repo
fi fi