Merge "Switch ZSWAP_ZPOOL to zsmalloc"
diff --git a/.zuul.yaml b/.zuul.yaml
index 48dd55e..9552fa3 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -735,6 +735,10 @@
parent: tempest-full-py3
description: CentOS 9 Stream platform test
nodeset: devstack-single-node-centos-9-stream
+ vars:
+ devstack_localrc:
+ # TODO(ykarel) Remove this when moving to 10-stream
+ PYTHON3_VERSION: 3.11
timeout: 9000
voting: false
@@ -760,6 +764,9 @@
voting: false
vars:
configure_swap_size: 4096
+ devstack_localrc:
+ # TODO(ykarel) Remove this when moving to rocky10
+ PYTHON3_VERSION: 3.11
- job:
name: devstack-platform-ubuntu-jammy
diff --git a/lib/apache b/lib/apache
index 744c0f1..449d2e7 100644
--- a/lib/apache
+++ b/lib/apache
@@ -89,7 +89,7 @@
# didn't fix Python 3.10 compatibility before release. Should be
# fixed in uwsgi 4.9.0; can remove this when packages available
# or we drop this release
- elif is_fedora && ! is_openeuler && ! [[ $DISTRO =~ f36 ]]; then
+ elif is_fedora && ! is_openeuler && ! [[ $DISTRO =~ f36|rhel9 ]]; then
# Note httpd comes with mod_proxy_uwsgi and it is loaded by
# default; the mod_proxy_uwsgi package actually conflicts now.
# See:
@@ -137,7 +137,7 @@
install_package libapache2-mod-wsgi-py3
elif is_fedora; then
sudo rm -f /etc/httpd/conf.d/000-*
- install_package httpd python3-mod_wsgi
+ install_package httpd python${PYTHON3_VERSION}-mod_wsgi
# rpm distros dont enable httpd by default so enable it to support reboots.
sudo systemctl enable httpd
# For consistency with Ubuntu, switch to the worker mpm, as
diff --git a/lib/dstat b/lib/dstat
index 870c901..9bd0370 100644
--- a/lib/dstat
+++ b/lib/dstat
@@ -33,7 +33,7 @@
# To enable memory_tracker add:
# enable_service memory_tracker
# to your localrc
- run_process memory_tracker "$TOP_DIR/tools/memory_tracker.sh" "" "root"
+ run_process memory_tracker "$TOP_DIR/tools/memory_tracker.sh" "" "root" "PYTHON=python${PYTHON3_VERSION}"
# TODO(jh): Fail when using the old service name otherwise consumers might
# never notice that is has been removed.
diff --git a/lib/nova_plugins/functions-libvirt b/lib/nova_plugins/functions-libvirt
index ba2e98e..3584053 100644
--- a/lib/nova_plugins/functions-libvirt
+++ b/lib/nova_plugins/functions-libvirt
@@ -93,7 +93,13 @@
# as the base system version is too old. We should have
# pre-installed these
install_package $qemu_package
- install_package libvirt libvirt-devel python3-libvirt
+ install_package libvirt libvirt-devel
+
+ if [[ $DISTRO =~ rhel9 ]]; then
+ pip_install_gr libvirt-python
+ else
+ install_package python3-libvirt
+ fi
if is_arch "aarch64"; then
install_package edk2-aarch64