openstack/octavia
Code Issues Proposed changes

dib: Remove remaining logic for CentOS/RHEL 8

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

Change-Id: I90e5b85827a324c0a258fd30cf94b3e8ac8c841f
This commit is contained in:
Takashi Kajinami 2024-03-13 12:13:31 +09:00
parent ffc6f83f07
commit 02a2195e54
3 changed files with 0 additions and 43 deletions
elements
amphora-agent
pkg-map
post-install.d
10-enable-network-scripts
haproxy-octavia/pre-install.d
01-repositories

18
elements/amphora-agent/pkg-map

@ -1,15 +1,6 @@
{ {
"release": { "release": {
"rhel": { "rhel": {
"8": {
"isc-dhcp-client": "dhcp-client",
"python3-dev": "platform-python-devel",
"python3-venv": "python3-virtualenv",
"python3": "python36",
"vlan": "",
"screen": "",
"dkms": ""
},
"9": { "9": {
"isc-dhcp-client": "dhcp-client", "isc-dhcp-client": "dhcp-client",
"python3-dev": "platform-python-devel", "python3-dev": "platform-python-devel",
@ -22,15 +13,6 @@
} }
}, },
"centos": { "centos": {
"8": {
"isc-dhcp-client": "dhcp-client",
"python3-dev": "platform-python-devel",
"python3-venv": "python3-virtualenv",
"python3": "python36",
"vlan": "",
"screen": "",
"dkms": ""
},
"9-stream": { "9-stream": {
"isc-dhcp-client": "dhcp-client", "isc-dhcp-client": "dhcp-client",
"python3-dev": "platform-python-devel", "python3-dev": "platform-python-devel",

4
elements/amphora-agent/post-install.d/10-enable-network-scripts

@ -7,10 +7,6 @@ fi
set -eu set -eu
set -o pipefail set -o pipefail
if [[ "$DISTRO_NAME" =~ (rhel|centos) ]] && [ "$DIB_RELEASE" == "8" ]; then
chkconfig network on
fi
if [[ "$DISTRO_NAME" =~ (ubuntu) ]] && [ "$DIB_RELEASE" == "focal" ]; then if [[ "$DISTRO_NAME" =~ (ubuntu) ]] && [ "$DIB_RELEASE" == "focal" ]; then
systemctl enable systemd-networkd systemctl enable systemd-networkd
fi fi

21
elements/haproxy-octavia/pre-install.d/01-repositories

@ -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