From 83afcfe9a939b9af91c50eb6dfd3b435ee75b881 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Thu, 12 Jun 2014 08:47:50 +1000 Subject: [PATCH] [Fedora] Devstack fails to install in firewalld less system The official F20 cloud image does not contains the firewalld, there is nothing to restart, and it fails the installation. The previous workaround change, assumed all is_fedoras has a restartable firewalld without ensuring is it installed at all. RHEL6 even does not have a firewalld. Closes-bug: #1329102 Change-Id: I3d119ce48af81b30bf02b01c2cd386612ac6ef90 --- lib/nova_plugins/functions-libvirt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/nova_plugins/functions-libvirt b/lib/nova_plugins/functions-libvirt index a6738e22df..18bdf89025 100644 --- a/lib/nova_plugins/functions-libvirt +++ b/lib/nova_plugins/functions-libvirt @@ -29,12 +29,16 @@ function install_libvirt { install_package python-libguestfs fi - # Restart dbus/firewalld after install of libvirt to avoid a - # problem with polkit, which libvirtd brings in. See + # Restart firewalld after install of libvirt to avoid a problem + # with polkit, which libvirtd brings in. See # https://bugzilla.redhat.com/show_bug.cgi?id=1099031 + + # Note there is a difference between F20 rackspace cloud images + # and HP images used in the gate; rackspace has firewalld but hp + # cloud doesn't. RHEL6 doesn't have firewalld either. So we + # don't care if it fails. if is_fedora; then - sudo service dbus restart - sudo service firewalld restart + sudo service firewalld restart || true fi }