[Fedora-spins] [spin-kickstarts/f21] put the remove-firewalld code back -- apparently still needed and having it there is breaking openst

[Matthew Miller]

commit 0c244663aafceb59b48951c1e015e33c58777b2c
Author: Matthew Miller <mattdm at mattdm.org>
Date:   Thu Oct 2 13:22:33 2014 -0400

    put the remove-firewalld code back -- apparently still needed and having it
    there is breaking openstack

 fedora-cloud-base.ks         |    5 +++++
 fedora-cloud-experimental.ks |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index dc738d7..1cbfdc4 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -109,6 +109,11 @@ echo .
 echo "Removing linux-firmware package."
 yum -C -y remove linux-firmware
 
+# Remove firewalld; was supposed to be optional in F18+, but is pulled in
+# in install/image building.
+echo "Removing firewalld."
+yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
+
 # Another one needed at install time but not after that, and it pulls
 # in some unneeded deps (like, newt and slang)
 echo "Removing authconfig."
diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks
index e181d67..b865c4c 100644
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -110,7 +110,7 @@ yum -C -y remove linux-firmware
 # Remove firewalld; was supposed to be optional in F18+, but is required to
 # be present for install/image building.
 echo "Removing firewalld."
-yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
+yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
 
 # Another one needed at install time but not after that, and it pulls
 # in some unneeded deps (like, newt and slang)