openstack/devstack
Code Issues Proposed changes

Fix rockylinux and make it voting

Browse Source 
Some rockylinux deployments have the curl-minimal package installed by
default (the latest GenericCloud image still has the curl package), it
triggers an error when devstack wants to install the curl package.
Fix this issue by swaping curl-minimal with curl before installing base
packages.

Change-Id: I969e8dc22e7d11c9917a843d9245f33a04fe197d
This commit is contained in:
Gregory Thiemonge 2023-02-16 10:26:32 +01:00
parent 48af5d4b1b
commit fcc525f4fc
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.zuul.yaml
View File

@ -726,7 +726,6 @@
description: Rocky Linux 9 Blue Onyx platform test description: Rocky Linux 9 Blue Onyx platform test
nodeset: devstack-single-node-rockylinux-9 nodeset: devstack-single-node-rockylinux-9
timeout: 9000 timeout: 9000
voting: false
vars: vars:
configure_swap_size: 4096 configure_swap_size: 4096

7
stack.sh
View File

@ -394,6 +394,13 @@ elif [[ $DISTRO == "rhel9" ]]; then
sudo dnf config-manager --set-enabled crb sudo dnf config-manager --set-enabled crb
# rabbitmq and other packages are provided by RDO repositories. # rabbitmq and other packages are provided by RDO repositories.
_install_rdo _install_rdo
# Some distributions (Rocky Linux 9) provide curl-minimal instead of curl,
# it triggers a conflict when devstack wants to install "curl".
# Swap curl-minimal with curl.
if is_package_installed curl-minimal; then
sudo dnf swap -y curl-minimal curl
fi
elif [[ $DISTRO == "openEuler-22.03" ]]; then elif [[ $DISTRO == "openEuler-22.03" ]]; then
# There are some problem in openEuler. We should fix it first. Some required # There are some problem in openEuler. We should fix it first. Some required
# package/action runs before fixup script. So we can't fix there. # package/action runs before fixup script. So we can't fix there.