Merge "Fix rockylinux and make it voting"
diff --git a/.zuul.yaml b/.zuul.yaml
index 30e5397..8e20f6e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -726,7 +726,6 @@
description: Rocky Linux 9 Blue Onyx platform test
nodeset: devstack-single-node-rockylinux-9
timeout: 9000
- voting: false
vars:
configure_swap_size: 4096
diff --git a/stack.sh b/stack.sh
index 28576d1..ccd2d16 100755
--- a/stack.sh
+++ b/stack.sh
@@ -394,6 +394,13 @@
sudo dnf config-manager --set-enabled crb
# rabbitmq and other packages are provided by RDO repositories.
_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
# 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.