Skip to content

Commit 78a07d7

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Add Fedora 34 support"
2 parents e7bb05d + 156ccba commit 78a07d7

3 files changed

Lines changed: 2 additions & 8 deletions

File tree

files/rpms/swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ memcached
44
rsync-daemon
55
sqlite
66
xfsprogs
7-
xinetd
7+
xinetd # not:f34

lib/nova

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -298,12 +298,6 @@ function configure_nova {
298298
fi
299299
fi
300300

301-
if is_fedora && [[ $DISTRO =~ f31] ]]; then
302-
# For f31 use the rebased 2.1.0 version of the package.
303-
sudo dnf copr enable -y lyarwood/iscsi-initiator-utils
304-
sudo dnf update -y
305-
fi
306-
307301
if [[ ${ISCSID_DEBUG} == "True" ]]; then
308302
# Install an override that starts iscsid with debugging
309303
# enabled.

stack.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ write_devstack_version
227227

228228
# Warn users who aren't on an explicitly supported distro, but allow them to
229229
# override check and attempt installation with ``FORCE=yes ./stack``
230-
SUPPORTED_DISTROS="focal|f31|f32|opensuse-15.2|opensuse-tumbleweed|rhel8"
230+
SUPPORTED_DISTROS="focal|f34|opensuse-15.2|opensuse-tumbleweed|rhel8"
231231

232232
if [[ ! ${DISTRO} =~ $SUPPORTED_DISTROS ]]; then
233233
echo "WARNING: this script has not been tested on $DISTRO"

0 commit comments

Comments
 (0)