Merge "dib: Remove remaining logic for CentOS/RHEL 8"
This commit is contained in:
commit
6b4975f5b2
|
@ -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",
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
|
Loading…
Reference in New Issue