From 12874e28cf46c8d8a7ac88f8dee63991a6b5781c Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Fri, 12 Dec 2014 12:21:48 -0800
Subject: [PATCH] MODULES-1572 - Fix logic broken from MODULES-1309

Accidentally changed some behavior and broke things with the fix for
MODULES-1309
---
 manifests/linux/debian.pp | 2 +-
 manifests/params.pp       | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/manifests/linux/debian.pp b/manifests/linux/debian.pp
index 9e431082e..87ec123df 100644
--- a/manifests/linux/debian.pp
+++ b/manifests/linux/debian.pp
@@ -27,7 +27,7 @@
   }
 
   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 2e8533e1b..d990a1ae8 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -25,10 +25,7 @@
       }
     }
     '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 {