Merge "Remove libvirt apparmor workaround"
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 5ab74b7..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:
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/host b/lib/host
index a812c39..58062ef 100644
--- a/lib/host
+++ b/lib/host
@@ -35,7 +35,7 @@
# lz4 is very fast although it does not have the best compression
# zstd has much better compression but more latency
ZSWAP_COMPRESSOR=${ZSWAP_COMPRESSOR:="lz4"}
-ZSWAP_ZPOOL=${ZSWAP_ZPOOL:="z3fold"}
+ZSWAP_ZPOOL=${ZSWAP_ZPOOL:="zsmalloc"}
function configure_zswap {
if [[ $ENABLE_ZSWAP == "True" ]] ; then
# Centos 9 stream seems to only support enabling but not run time
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