Bump fedora-latest to F35
Generally this is straight forward, but Horizon has a dependency issue with pyScss (described in [1]) so it is disabled, for now. [1] https://bugs.launchpad.net/horizon/+bug/1960204 Co-Authored-By: Dr. Jens Harbott <harbott@osism.tech> Depends-On: https://review.opendev.org/c/openstack/devstack/+/827578 Change-Id: I7c4bf0945f9ac5bd563fe0a698c09b8571c97c5e
This commit is contained in:
parent
a756f4b968
commit
343e351627
@ -90,7 +90,7 @@
|
|||||||
name: devstack-single-node-fedora-latest
|
name: devstack-single-node-fedora-latest
|
||||||
nodes:
|
nodes:
|
||||||
- name: controller
|
- name: controller
|
||||||
label: fedora-34
|
label: fedora-35
|
||||||
groups:
|
groups:
|
||||||
- name: tempest
|
- name: tempest
|
||||||
nodes:
|
nodes:
|
||||||
@ -729,6 +729,10 @@
|
|||||||
voting: false
|
voting: false
|
||||||
vars:
|
vars:
|
||||||
configure_swap_size: 4096
|
configure_swap_size: 4096
|
||||||
|
# Python 3.10 dependency issues; see
|
||||||
|
# https://bugs.launchpad.net/horizon/+bug/1960204
|
||||||
|
devstack_services:
|
||||||
|
horizon: false
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: devstack-platform-fedora-latest-virt-preview
|
name: devstack-platform-fedora-latest-virt-preview
|
||||||
|
@ -4,4 +4,4 @@ memcached
|
|||||||
rsync-daemon
|
rsync-daemon
|
||||||
sqlite
|
sqlite
|
||||||
xfsprogs
|
xfsprogs
|
||||||
xinetd # not:f34,rhel9
|
xinetd # not:f35,rhel9
|
||||||
|
@ -85,7 +85,12 @@ function install_apache_uwsgi {
|
|||||||
if is_ubuntu; then
|
if is_ubuntu; then
|
||||||
local pkg_list="uwsgi uwsgi-plugin-python3 libapache2-mod-proxy-uwsgi"
|
local pkg_list="uwsgi uwsgi-plugin-python3 libapache2-mod-proxy-uwsgi"
|
||||||
install_package ${pkg_list}
|
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
|
# Note httpd comes with mod_proxy_uwsgi and it is loaded by
|
||||||
# default; the mod_proxy_uwsgi package actually conflicts now.
|
# default; the mod_proxy_uwsgi package actually conflicts now.
|
||||||
# See:
|
# See:
|
||||||
|
2
stack.sh
2
stack.sh
@ -227,7 +227,7 @@ write_devstack_version
|
|||||||
|
|
||||||
# Warn users who aren't on an explicitly supported distro, but allow them to
|
# Warn users who aren't on an explicitly supported distro, but allow them to
|
||||||
# override check and attempt installation with ``FORCE=yes ./stack``
|
# 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
|
if [[ ! ${DISTRO} =~ $SUPPORTED_DISTROS ]]; then
|
||||||
echo "WARNING: this script has not been tested on $DISTRO"
|
echo "WARNING: this script has not been tested on $DISTRO"
|
||||||
|
Loading…
Reference in New Issue
Block a user