From cc18c1e1b513b02559cd57ce36a6aedc76a606c1 Mon Sep 17 00:00:00 2001
From: Gregory Thiemonge <gthiemon@redhat.com>
Date: Fri, 18 Feb 2022 11:29:22 +0100
Subject: [PATCH] Fix centos 8 stream haproxy repository

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
---
 elements/haproxy-octavia/pre-install.d/01-repositories | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/elements/haproxy-octavia/pre-install.d/01-repositories b/elements/haproxy-octavia/pre-install.d/01-repositories
index e553cbe67b..726fdfb663 100755
--- a/elements/haproxy-octavia/pre-install.d/01-repositories
+++ b/elements/haproxy-octavia/pre-install.d/01-repositories
@@ -3,7 +3,7 @@
 set -eu
 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
     # REVISIT(cgoncalves): replace arch if-else + GPG with release RPM once available
     if [[ "$ARCH" =~ (aarch64|arm64) ]]; then
@@ -16,6 +16,6 @@ if [[ "$DISTRO_NAME" == "centos" && "$DIB_RELEASE" == "8" ]]; then
         echo "ERROR: Unsupported architecture $ARCH"
         exit 1
     fi
-    dnf config-manager --add-repo http://mirror.centos.org/centos/8/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
+    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_${DIB_RELEASE}_nfv_*_network-extras.repo
 fi