diff --git a/.zuul.yaml b/.zuul.yaml index 9105d7e27c..94410b42e4 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -72,7 +72,7 @@ name: devstack-single-node-fedora-latest nodes: - name: controller - label: fedora-31 + label: fedora-32 groups: - name: tempest nodes: diff --git a/stack.sh b/stack.sh index ba9da638a8..5f9b553536 100755 --- a/stack.sh +++ b/stack.sh @@ -221,7 +221,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`` -if [[ ! ${DISTRO} =~ (bionic|focal|f30|f31|opensuse-15.0|opensuse-15.1|opensuse-tumbleweed|rhel8) ]]; then +if [[ ! ${DISTRO} =~ (bionic|focal|f30|f31|f32|opensuse-15.0|opensuse-15.1|opensuse-tumbleweed|rhel8) ]]; then echo "WARNING: this script has not been tested on $DISTRO" if [[ "$FORCE" != "yes" ]]; then die $LINENO "If you wish to run this script anyway run with FORCE=yes" diff --git a/tools/fixup_stuff.sh b/tools/fixup_stuff.sh index c0e07dd51c..a3bda2b74f 100755 --- a/tools/fixup_stuff.sh +++ b/tools/fixup_stuff.sh @@ -143,6 +143,13 @@ function fixup_fedora { # overwriting works. So this hacks around those packages that # have been dragged in by some other system dependency sudo rm -rf /usr/lib64/python3*/site-packages/PyYAML-*.egg-info + + # NOTE(lyarwood): Workaround a known issue on Fedora with dnsmasq >= 2.81 + # by downgrading to 2.80 for the time being. + # https://bugs.launchpad.net/neutron/+bug/1896945 + if [[ "$DISTRO" == "f32" ]] && [[ $(rpm --queryformat %{VERSION} -q dnsmasq) != "2.80" ]]; then + sudo dnf downgrade dnsmasq-2.80 -y + fi } function fixup_suse {