From: Lukas Bezdicka <lbezdick@redhat.com>
Date: Mon, 28 Apr 2014 10:31:56 +0000 (+0200)
Subject: Fix support for Fedora Rawhide
X-Git-Tag: 1.1.0~4^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=57e883109663a7d370c52ff68b965bca159042d7;p=puppet-modules%2Fpuppetlabs-firewall.git

Fix support for Fedora Rawhide

On Fedora facter $::operatingsystemrelease can be integer version of Fedora or string Rawhide.
---

diff --git a/manifests/linux/redhat.pp b/manifests/linux/redhat.pp
index a4c00b6..f697d21 100644
--- a/manifests/linux/redhat.pp
+++ b/manifests/linux/redhat.pp
@@ -26,7 +26,7 @@ class firewall::linux::redhat (
     }
   }
 
-  if $::operatingsystem == Fedora and $::operatingsystemrelease >= 15 {
+  if ($::operatingsystem == 'Fedora' and (( $::operatingsystemrelease =~ /^\d+/ and $::operatingsystemrelease >= 15 ) or $::operatingsystemrelease == "Rawhide")) {
     package { 'iptables-services':
       ensure => present,
     }
diff --git a/spec/unit/classes/firewall_linux_spec.rb b/spec/unit/classes/firewall_linux_spec.rb
index 7c76bd0..42056c1 100644
--- a/spec/unit/classes/firewall_linux_spec.rb
+++ b/spec/unit/classes/firewall_linux_spec.rb
@@ -7,7 +7,7 @@ describe 'firewall::linux', :type => :class do
   context 'RedHat like' do
     %w{RedHat CentOS Fedora}.each do |os|
       context "operatingsystem => #{os}" do
-        releases = (os == 'Fedora' ? [14,15] : [6,7])
+        releases = (os == 'Fedora' ? [14,15,'Rawhide'] : [6,7])
         releases.each do |osrel|
           context "operatingsystemrelease => #{osrel}" do
             let(:facts) { facts_default.merge({ :operatingsystem => os,