[openstack-puppet-modules] Fixed firewalld package issue

[Lukas Bezdicka]

commit 221ceb7428d3b891926ea057e44618ac6086a607
Author: Lukas Bezdicka <lbezdick at redhat.com>
Date:   Fri Oct 24 16:05:05 2014 +0200

    Fixed firewalld package issue

 0009-Fixed-firewalld-package-issue.patch |   57 ++++++++++++++++++++++++++++++
 openstack-puppet-modules.spec            |    7 +++-
 2 files changed, 63 insertions(+), 1 deletions(-)
---
diff --git a/0009-Fixed-firewalld-package-issue.patch b/0009-Fixed-firewalld-package-issue.patch
new file mode 100644
index 0000000..c21a562
--- /dev/null
+++ b/0009-Fixed-firewalld-package-issue.patch
@@ -0,0 +1,57 @@
+From f23383807ffccade34a818a6117685921070f6ec Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr at redhat.com>
+Date: Fri, 24 Oct 2014 09:37:01 +0200
+Subject: [PATCH] Fixed firewalld package issue
+
+Firewalld package cannot be uninstalled, because other packages might be dependent
+on it. This patch makes just firewalld service to stop and be disabled.
+
+For more info please check: https://bugzilla.redhat.com/show_bug.cgi?id=1148399
+---
+ firewall/manifests/linux/redhat.pp                       | 7 ++++---
+ firewall/spec/unit/classes/firewall_linux_redhat_spec.rb | 7 ++++---
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/firewall/manifests/linux/redhat.pp b/firewall/manifests/linux/redhat.pp
+index b7a4d0e..c808c7e 100644
+--- a/firewall/manifests/linux/redhat.pp
++++ b/firewall/manifests/linux/redhat.pp
+@@ -22,9 +22,10 @@ class firewall::linux::redhat (
+   # lib/puppet/util/firewall.rb.
+   if   ($::operatingsystem != 'Fedora' and versioncmp($::operatingsystemrelease, '7.0') >= 0)
+     or ($::operatingsystem == 'Fedora' and versioncmp($::operatingsystemrelease, '15') >= 0) {
+-    package { 'firewalld':
+-      ensure  => absent,
+-      before  => Package['iptables-services'],
++    service { "firewalld":
++      ensure => stopped,
++      enable => false,
++      before => Package['iptables-services']
+     }
+ 
+     package { 'iptables-services':
+diff --git a/firewall/spec/unit/classes/firewall_linux_redhat_spec.rb b/firewall/spec/unit/classes/firewall_linux_redhat_spec.rb
+index 43263fa..9ffab44 100644
+--- a/firewall/spec/unit/classes/firewall_linux_redhat_spec.rb
++++ b/firewall/spec/unit/classes/firewall_linux_redhat_spec.rb
+@@ -12,7 +12,7 @@ describe 'firewall::linux::redhat', :type => :class do
+           :operatingsystemrelease => osrel
+         }}
+ 
+-        it { should_not contain_package('firewalld') }
++        it { should_not contain_service('firewalld') }
+         it { should_not contain_package('iptables-services') }
+       end
+     end
+@@ -24,8 +24,9 @@ describe 'firewall::linux::redhat', :type => :class do
+           :operatingsystemrelease => osrel
+         }}
+ 
+-        it { should contain_package('firewalld').with(
+-          :ensure => 'absent',
++        it { should contain_service('firewalld').with(
++          :ensure => 'stopped',
++          :enable => false,
+           :before => 'Package[iptables-services]'
+         )}
+ 
diff --git a/openstack-puppet-modules.spec b/openstack-puppet-modules.spec
index 3d8e805..42836d1 100644
--- a/openstack-puppet-modules.spec
+++ b/openstack-puppet-modules.spec
@@ -1,7 +1,7 @@
 
 Name:           openstack-puppet-modules
 Version:        2014.2.1
-Release:        0.4%{?dist}
+Release:        0.5%{?dist}
 Summary:        Collection of Puppet modules for OpenStack deployment
 License:        ASL 2.0 and GPLv2 and GPLv3
 
@@ -17,6 +17,7 @@ Patch0005: 0005-neutron-Configure-OVS-mechanism-agent-configs-in-its.patch
 Patch0006: 0006-neutron-Fixes-plugin.ini-error.patch
 Patch0007: 0007-keystone-Add-manage_service-feature.patch
 Patch0008: 0008-swift-Add-manage_service-feature.patch
+Patch0009: 0009-Fixed-firewalld-package-issue.patch
 
 BuildArch:      noarch
 Requires:       rubygem-json
@@ -37,6 +38,7 @@ OpenStack via installers using Puppet configuration tool.
 %patch0006 -p1
 %patch0007 -p1
 %patch0008 -p1
+%patch0009 -p1
 
 find %{_builddir}/%{name}-%{version}/ -type f -name ".*" -exec rm {} +
 find %{_builddir}/%{name}-%{version}/ -size 0 -exec rm {} +
@@ -104,6 +106,9 @@ rm -f %{buildroot}/%{_datadir}/openstack-puppet/modules/nova/files/nova-novncpro
 
 
 %changelog
+* Fri Oct 24 2014 Lukas Bezdicka <lbezdick at redhat.com> 2014.2.1-0.5
+- Fixed firewalld package issue
+
 * Mon Oct 06 2014 Martin Mágr <mmagr at redhat.com> 2014.2.1-0.4
 - Update to upstream 2014.2.1