[openstack-packstack] Remove firewalld workaround.

[Alan Pevec]

commit d3d1b2aa359833ba9abdfd452fcf72cef3924eef
Author: Alan Pevec <alan.pevec at redhat.com>
Date:   Fri Oct 24 22:41:02 2014 +0200

    Remove firewalld workaround.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1148399

 Remove-firewalld-workaround.patch |   33 +++++++++++++++++++++++++++++++++
 openstack-packstack.spec          |    9 +++++++--
 2 files changed, 40 insertions(+), 2 deletions(-)
---
diff --git a/Remove-firewalld-workaround.patch b/Remove-firewalld-workaround.patch
new file mode 100644
index 0000000..513dd68
--- /dev/null
+++ b/Remove-firewalld-workaround.patch
@@ -0,0 +1,33 @@
+From 540fefe08b0a8bb9ad142705cf058947e22124ec Mon Sep 17 00:00:00 2001
+From: Lukas Bezdicka <lbezdick at redhat.com>
+Date: Fri, 24 Oct 2014 16:28:53 +0200
+Subject: [PATCH] Remove firewalld workaround as it should be part of
+ puppet-firewall now
+
+Change-Id: Idbf62b7433d2f3587562c5a3556fd765aaa04aef
+---
+ packstack/puppet/templates/prescript.pp | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/packstack/puppet/templates/prescript.pp b/packstack/puppet/templates/prescript.pp
+index b75874e..d6d37dd 100644
+--- a/packstack/puppet/templates/prescript.pp
++++ b/packstack/puppet/templates/prescript.pp
+@@ -19,14 +19,6 @@ if $::operatingsystem in $el_releases and $::operatingsystemmajrelease < 7 {
+   }
+ }
+ 
+-# Stop firewalld since everything uses iptables. Firewalld provider will
+-# have to be implemented in puppetlabs-firewall in future.
+-service { "firewalld":
+-  ensure => "stopped",
+-  enable => false,
+-  before => Service['iptables'],
+-}
+-
+ package { 'audit':
+   ensure => present,
+ } ->
+-- 
+1.9.3
+
diff --git a/openstack-packstack.spec b/openstack-packstack.spec
index fa00223..435c4aa 100644
--- a/openstack-packstack.spec
+++ b/openstack-packstack.spec
@@ -7,7 +7,7 @@
 
 Name:           openstack-packstack
 Version:        2014.2
-Release:        0.3.dev%{git_snaptag}.%{git_commit}%{?dist}
+Release:        0.4.dev%{git_snaptag}.%{git_commit}%{?dist}
 Summary:        Openstack Install Utility
 
 Group:          Applications/System
@@ -17,6 +17,7 @@ URL:            https://github.com/stackforge/packstack
 Source0:        http://mmagr.fedorapeople.org/downloads/packstack/packstack-%{version}.dev%{git_snaptag}.%{git_commit}.tar.gz
 
 Patch0:         enable-epel.patch
+Patch1:         Remove-firewalld-workaround.patch
 
 BuildArch:      noarch
 
@@ -26,7 +27,7 @@ BuildRequires:  python-setuptools
 Requires:       openssh-clients
 Requires:       python-netaddr
 Requires:       openstack-packstack-puppet == %{version}-%{release}
-Requires:       openstack-puppet-modules
+Requires:       openstack-puppet-modules >= 2014.2.1-0.5
 Requires:       python-setuptools
 
 %description
@@ -71,6 +72,7 @@ This package contains documentation files for Packstack.
 %if 0%{?rhel}
 %patch0 -p1
 %endif
+%patch1 -p1
 
 # Sanitizing a lot of the files in the puppet modules
 find packstack/puppet/modules \( -name .fixtures.yml -o -name .gemfile -o -name ".travis.yml" -o -name .rspec \) -exec rm {} +
@@ -144,6 +146,9 @@ install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
 # changelog --------------------------------------------------------------------
 
 %changelog
+* Fri Oct 24 2014 Alan Pevec <apevec at redhat.com> - 2014.2-0.4.dev1266
+- Remove firewalld workaround.
+
 * Thu Sep 18 2014  Gael Chamoulaud <gchamoul at redhat.com> - 2014.2-0.3.dev1266
 - Add enable-epel.patch only applied for rhel.