From 64b2ebca15701785af09d2c225d7c81e3c6acdce Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Fri, 5 Jun 2015 12:22:36 -0500 Subject: [PATCH] Make sure iptables-services is installed The iptables service files are no longer included by default on Fedora. This causes the systemctl calls in fixup_stuff.sh to fail when disabling firewalld in favor of iptables. Change-Id: If37691d03e3d07ca8b53c541717081beeb184c16 Closes-Bug: #1462347 --- files/rpms/general | 1 + tools/fixup_stuff.sh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/files/rpms/general b/files/rpms/general index 7b2c00ad5c..43101f7c87 100644 --- a/files/rpms/general +++ b/files/rpms/general @@ -28,3 +28,4 @@ net-tools java-1.7.0-openjdk-headless # NOPRIME rhel7,f20 java-1.8.0-openjdk-headless # NOPRIME f21,f22 pyOpenSSL # version in pip uses too much memory +iptables-services # NOPRIME f21,f22 diff --git a/tools/fixup_stuff.sh b/tools/fixup_stuff.sh index 31258d13f7..4fff57f401 100755 --- a/tools/fixup_stuff.sh +++ b/tools/fixup_stuff.sh @@ -126,6 +126,9 @@ if is_fedora; then # [4] http://docs.openstack.org/developer/devstack/guides/neutron.html if is_package_installed firewalld; then sudo systemctl disable firewalld + # The iptables service files are no longer included by default, + # at least on a baremetal Fedora 21 Server install. + install_package iptables-services sudo systemctl enable iptables sudo systemctl stop firewalld sudo systemctl start iptables