From: Eli Young <elyscape@gmail.com>
Date: Wed, 6 May 2015 18:36:51 +0000 (-0700)
Subject: Arch Linux is not a Red Hat distro
X-Git-Tag: 1.6.0~7^2~1
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=204bfb06035511cd5ec3d6ac51459d580364f605;p=puppet-modules%2Fpuppetlabs-firewall.git

Arch Linux is not a Red Hat distro

Previously, Arch Linux was incorrectly assumed to be part of the RedHat
osfamily. It actually has its own osfamily: Archlinux. However, this was
added in Facter 1.7.0, and previous versions use an osfamily of Linux,
so we just check the value of operatingsystem.
---

diff --git a/manifests/params.pp b/manifests/params.pp
index 9d0f64d..1e926e7 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -6,10 +6,6 @@ class firewall::params {
           $service_name = 'iptables'
           $package_name = undef
         }
-        'Archlinux': {
-          $service_name = ['iptables','ip6tables']
-          $package_name = undef
-        }
         'Fedora': {
           if versioncmp($::operatingsystemrelease, '15') >= 0 {
             $package_name = 'iptables-services'
@@ -61,8 +57,16 @@ class firewall::params {
       $package_name = 'net-firewall/iptables'
     }
     default: {
-      $package_name = undef
-      $service_name = 'iptables'
+      case $::operatingsystem {
+        'Archlinux': {
+          $service_name = ['iptables','ip6tables']
+          $package_name = undef
+        }
+        default: {
+          $service_name = 'iptables'
+          $package_name = undef
+        }
+      }
     }
   }
 }
diff --git a/spec/unit/classes/firewall_linux_archlinux_spec.rb b/spec/unit/classes/firewall_linux_archlinux_spec.rb
index cf5b19b..36dc925 100644
--- a/spec/unit/classes/firewall_linux_archlinux_spec.rb
+++ b/spec/unit/classes/firewall_linux_archlinux_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'firewall::linux::archlinux', :type => :class do
   let(:facts) do
     {
-      :osfamily        => 'RedHat',
+      :osfamily        => 'Archlinux',
       :operatingsystem => 'Archlinux'
     }
   end