openstack/devstack
Code Issues Proposed changes

Merge "Add Fedora 32 to supported list and use as fedora-latest"

Browse Source
This commit is contained in:
Zuul 2020-09-28 12:15:10 +00:00 committed by Gerrit Code Review
commit 2c07049b40
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

@ -72,7 +72,7 @@
name: devstack-single-node-fedora-latest name: devstack-single-node-fedora-latest
nodes: nodes:
- name: controller - name: controller
label: fedora-31 label: fedora-32
groups: groups:
- name: tempest - name: tempest
nodes: nodes:

2
stack.sh
View File

@ -221,7 +221,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``
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" echo "WARNING: this script has not been tested on $DISTRO"
if [[ "$FORCE" != "yes" ]]; then if [[ "$FORCE" != "yes" ]]; then
die $LINENO "If you wish to run this script anyway run with FORCE=yes" die $LINENO "If you wish to run this script anyway run with FORCE=yes"

7
tools/fixup_stuff.sh
View File

@ -143,6 +143,13 @@ function fixup_fedora {
# overwriting works. So this hacks around those packages that # overwriting works. So this hacks around those packages that
# have been dragged in by some other system dependency # have been dragged in by some other system dependency
sudo rm -rf /usr/lib64/python3*/site-packages/PyYAML-*.egg-info 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 { function fixup_suse {