From 02a2195e54d30992ed5b5964cf14df46c5eec8b7 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Wed, 13 Mar 2024 12:13:31 +0900
Subject: [PATCH] dib: Remove remaining logic for CentOS/RHEL 8

... because CentOS 8 and RHEL 8 is no longer supported.

Change-Id: I90e5b85827a324c0a258fd30cf94b3e8ac8c841f
---
 elements/amphora-agent/pkg-map                | 18 ----------------
 .../post-install.d/10-enable-network-scripts  |  4 ----
 .../pre-install.d/01-repositories             | 21 -------------------
 3 files changed, 43 deletions(-)
 delete mode 100755 elements/haproxy-octavia/pre-install.d/01-repositories

diff --git a/elements/amphora-agent/pkg-map b/elements/amphora-agent/pkg-map
index 02b5d062a9..55c461b544 100644
--- a/elements/amphora-agent/pkg-map
+++ b/elements/amphora-agent/pkg-map
@@ -1,15 +1,6 @@
 {
   "release": {
     "rhel": {
-      "8": {
-        "isc-dhcp-client": "dhcp-client",
-        "python3-dev": "platform-python-devel",
-        "python3-venv": "python3-virtualenv",
-        "python3": "python36",
-        "vlan": "",
-        "screen": "",
-        "dkms": ""
-      },
       "9": {
         "isc-dhcp-client": "dhcp-client",
         "python3-dev": "platform-python-devel",
@@ -22,15 +13,6 @@
       }
     },
     "centos": {
-      "8": {
-        "isc-dhcp-client": "dhcp-client",
-        "python3-dev": "platform-python-devel",
-        "python3-venv": "python3-virtualenv",
-        "python3": "python36",
-        "vlan": "",
-        "screen": "",
-        "dkms": ""
-      },
       "9-stream": {
         "isc-dhcp-client": "dhcp-client",
         "python3-dev": "platform-python-devel",
diff --git a/elements/amphora-agent/post-install.d/10-enable-network-scripts b/elements/amphora-agent/post-install.d/10-enable-network-scripts
index db43bf9bed..4946bd2ca2 100755
--- a/elements/amphora-agent/post-install.d/10-enable-network-scripts
+++ b/elements/amphora-agent/post-install.d/10-enable-network-scripts
@@ -7,10 +7,6 @@ fi
 set -eu
 set -o pipefail
 
-if [[ "$DISTRO_NAME" =~ (rhel|centos) ]] && [ "$DIB_RELEASE" == "8" ]; then
-    chkconfig network on
-fi
-
 if [[ "$DISTRO_NAME" =~ (ubuntu) ]] && [ "$DIB_RELEASE" == "focal" ]; then
     systemctl enable systemd-networkd
 fi
diff --git a/elements/haproxy-octavia/pre-install.d/01-repositories b/elements/haproxy-octavia/pre-install.d/01-repositories
deleted file mode 100755
index 726fdfb663..0000000000
--- a/elements/haproxy-octavia/pre-install.d/01-repositories
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-set -eu
-set -o xtrace
-
-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
-        yum_arch=aarch64
-    elif [[ "$ARCH" =~ (ppc64le|ppc64el) ]]; then
-        yum_arch=ppc64le
-    elif [[ "$ARCH" =~ (x86_64|amd64) ]]; then
-        yum_arch=x86_64
-    else
-        echo "ERROR: Unsupported architecture $ARCH"
-        exit 1
-    fi
-    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