Drop logic for CentOS (Stream) 8
Change-Id: I528652ced464fadd565e16e89a7e0ef826d42611 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
@@ -1,10 +1,9 @@
|
||||
cryptsetup
|
||||
dosfstools
|
||||
genisoimage # not:rhel9,rhel10
|
||||
iscsi-initiator-utils
|
||||
libosinfo
|
||||
lvm2
|
||||
sg3_utils
|
||||
# Stuff for diablo volumes
|
||||
sysfsutils
|
||||
xorriso # not:rhel8
|
||||
xorriso
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
conntrack-tools
|
||||
curl
|
||||
ebtables
|
||||
genisoimage # not:rhel9,rhel10 required for config_drive
|
||||
genisoimage
|
||||
iptables
|
||||
iputils
|
||||
kernel-modules # not:openEuler-22.03
|
||||
@@ -11,4 +11,3 @@ polkit
|
||||
rabbitmq-server # NOPRIME
|
||||
sqlite
|
||||
sudo
|
||||
xorriso # not:rhel8
|
||||
|
||||
@@ -407,9 +407,6 @@ function install_ovn {
|
||||
sudo mkdir -p $OVS_PREFIX/var/log/ovn
|
||||
sudo chown $(whoami) $OVS_PREFIX/var/log/ovn
|
||||
else
|
||||
# Load fixup_ovn_centos
|
||||
source ${TOP_DIR}/tools/fixup_stuff.sh
|
||||
fixup_ovn_centos
|
||||
install_package $(get_packages openvswitch)
|
||||
install_package $(get_packages ovn)
|
||||
fi
|
||||
|
||||
31
stack.sh
31
stack.sh
@@ -366,36 +366,7 @@ fi
|
||||
# to speed things up
|
||||
SKIP_EPEL_INSTALL=$(trueorfalse False SKIP_EPEL_INSTALL)
|
||||
|
||||
if [[ $DISTRO == "rhel8" ]]; then
|
||||
# If we have /etc/ci/mirror_info.sh assume we're on a OpenStack CI
|
||||
# node, where EPEL is installed (but disabled) and already
|
||||
# pointing at our internal mirror
|
||||
if [[ -f /etc/ci/mirror_info.sh ]]; then
|
||||
SKIP_EPEL_INSTALL=True
|
||||
sudo dnf config-manager --set-enabled epel
|
||||
fi
|
||||
|
||||
# PowerTools repo provides libyaml-devel required by devstack itself and
|
||||
# EPEL packages assume that the PowerTools repository is enable.
|
||||
sudo dnf config-manager --set-enabled PowerTools
|
||||
|
||||
# CentOS 8.3 changed the repository name to lower case.
|
||||
sudo dnf config-manager --set-enabled powertools
|
||||
|
||||
if [[ ${SKIP_EPEL_INSTALL} != True ]]; then
|
||||
_install_epel
|
||||
fi
|
||||
# Along with EPEL, CentOS (and a-likes) require some packages only
|
||||
# available in RDO repositories (e.g. OVS, or later versions of
|
||||
# kvm) to run.
|
||||
_install_rdo
|
||||
|
||||
# NOTE(cgoncalves): workaround RHBZ#1154272
|
||||
# dnf fails for non-privileged users when expired_repos.json doesn't exist.
|
||||
# RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1154272
|
||||
# Patch: https://github.com/rpm-software-management/dnf/pull/1448
|
||||
echo "[]" | sudo tee /var/cache/dnf/expired_repos.json
|
||||
elif [[ $DISTRO == "rhel9" ]]; then
|
||||
if [[ $DISTRO == "rhel9" ]]; then
|
||||
# for CentOS Stream 9 repository
|
||||
sudo dnf config-manager --set-enabled crb
|
||||
# for RHEL 9 repository
|
||||
|
||||
@@ -89,19 +89,6 @@ EOF
|
||||
if is_package_installed python3-setuptools; then
|
||||
sudo dnf reinstall -y python3-setuptools
|
||||
fi
|
||||
# Workaround CentOS 8-stream iputils and systemd Bug
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2037807
|
||||
if [[ $os_VENDOR == "CentOSStream" && $os_RELEASE -eq 8 ]]; then
|
||||
sudo sysctl -w net.ipv4.ping_group_range='0 2147483647'
|
||||
fi
|
||||
}
|
||||
|
||||
function fixup_ovn_centos {
|
||||
if [[ $os_VENDOR != "CentOS" ]]; then
|
||||
return
|
||||
fi
|
||||
# OVN packages are part of this release for CentOS
|
||||
yum_install centos-release-openstack-victoria
|
||||
}
|
||||
|
||||
function fixup_ubuntu {
|
||||
|
||||
Reference in New Issue
Block a user