From: Morgan Haskel <morgan@puppetlabs.com>
Date: Fri, 12 Dec 2014 20:21:48 +0000 (-0800)
Subject: MODULES-1572 - Fix logic broken from MODULES-1309
X-Git-Tag: 1.3.0~5^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=12874e28cf46c8d8a7ac88f8dee63991a6b5781c;p=puppet-modules%2Fpuppetlabs-firewall.git

MODULES-1572 - Fix logic broken from MODULES-1309

Accidentally changed some behavior and broke things with the fix for
MODULES-1309
---

diff --git a/manifests/linux/debian.pp b/manifests/linux/debian.pp
index 9e43108..87ec123 100644
--- a/manifests/linux/debian.pp
+++ b/manifests/linux/debian.pp
@@ -27,7 +27,7 @@ class firewall::linux::debian (
   }
 
   if($::operatingsystemrelease =~ /^6\./ and $enable == true
-  and versioncmp($::iptables_persistent_version, '0.5.0') < 0 and ! $service_name) {
+  and versioncmp($::iptables_persistent_version, '0.5.0') < 0) {
     # This fixes a bug in the iptables-persistent LSB headers in 6.x, without it
     # we lose idempotency
     exec { 'iptables-persistent-enable':
diff --git a/manifests/params.pp b/manifests/params.pp
index 2e8533e..d990a1a 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -25,10 +25,7 @@ class firewall::params {
       }
     }
     'Debian': {
-      if $::operatingsystemrelease =~ /^6\./ and versioncmp($::iptables_persistent_version, '0.5.0') < 0 {
-        $service_name = undef
-        $package_name = 'iptables-persistent'
-      } elsif $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '8.0') >= 0 {
+      if $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '8.0') >= 0 {
         $service_name = 'netfilter-persistent'
         $package_name = 'netfilter-persistent'
       } else {