diff --git a/.zuul.yaml b/.zuul.yaml index 5a58d743fe..3278eeb9e0 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -90,7 +90,7 @@ name: devstack-single-node-fedora-latest nodes: - name: controller - label: fedora-34 + label: fedora-35 groups: - name: tempest nodes: @@ -729,6 +729,10 @@ voting: false vars: configure_swap_size: 4096 + # Python 3.10 dependency issues; see + # https://bugs.launchpad.net/horizon/+bug/1960204 + devstack_services: + horizon: false - job: name: devstack-platform-fedora-latest-virt-preview diff --git a/files/rpms/swift b/files/rpms/swift index faf0a3175a..a838d7839e 100644 --- a/files/rpms/swift +++ b/files/rpms/swift @@ -4,4 +4,4 @@ memcached rsync-daemon sqlite xfsprogs -xinetd # not:f34,rhel9 +xinetd # not:f35,rhel9 diff --git a/lib/apache b/lib/apache index cbe61adf34..f29c7ea2cb 100644 --- a/lib/apache +++ b/lib/apache @@ -85,7 +85,12 @@ function install_apache_uwsgi { if is_ubuntu; then local pkg_list="uwsgi uwsgi-plugin-python3 libapache2-mod-proxy-uwsgi" install_package ${pkg_list} - elif is_fedora && ! is_openeuler; then + # NOTE(ianw) 2022-02-03 : Fedora 35 needs to skip this and fall + # into the install-from-source because the upstream packages + # 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 =~ f35 ]]; 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/stack.sh b/stack.sh index c92cc79b40..0082b99f11 100755 --- a/stack.sh +++ b/stack.sh @@ -227,7 +227,7 @@ write_devstack_version # Warn users who aren't on an explicitly supported distro, but allow them to # override check and attempt installation with ``FORCE=yes ./stack`` -SUPPORTED_DISTROS="bullseye|focal|f34|opensuse-15.2|opensuse-tumbleweed|rhel8|rhel9|openEuler-20.03" +SUPPORTED_DISTROS="bullseye|focal|f35|opensuse-15.2|opensuse-tumbleweed|rhel8|rhel9|openEuler-20.03" if [[ ! ${DISTRO} =~ $SUPPORTED_DISTROS ]]; then echo "WARNING: this script has not been tested on $DISTRO"