openstack/devstack
Code Issues Proposed changes

Merge "Remove firewalld on Fedora 20 by default"

Browse Source
This commit is contained in:
Jenkins 2014-08-24 01:23:14 +00:00 committed by Gerrit Code Review
commit 7d9596781c
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nova_plugins/functions-libvirt
View File

@ -37,7 +37,7 @@ function install_libvirt {
# and HP images used in the gate; rackspace has firewalld but hp # and HP images used in the gate; rackspace has firewalld but hp
# cloud doesn't. RHEL6 doesn't have firewalld either. So we # cloud doesn't. RHEL6 doesn't have firewalld either. So we
# don't care if it fails. # don't care if it fails.
if is_fedora; then if is_fedora && is_package_installed firewalld; then
sudo service firewalld restart || true sudo service firewalld restart || true
fi fi
} }

15
tools/fixup_stuff.sh
View File

@ -103,6 +103,21 @@ if is_fedora; then
if selinuxenabled; then if selinuxenabled; then
sudo setenforce 0 sudo setenforce 0
fi fi
FORCE_FIREWALLD=$(trueorfalse False $FORCE_FIREWALLD)
if [[ ${DISTRO} =~ (f19|f20) && $FORCE_FIREWALLD == "False" ]]; then
# On Fedora 19 and 20 firewalld interacts badly with libvirt and
# slows things down significantly. However, for those cases
# where that combination is desired, allow this fix to be skipped.
# There was also an additional issue with firewalld hanging
# after install of libvirt with polkit. See
# https://bugzilla.redhat.com/show_bug.cgi?id=1099031
if is_package_installed firewalld; then
uninstall_package firewalld
fi
fi
fi fi
# RHEL6 # RHEL6