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 9e431082eb3e088165a8d4ef2dc287bb9f8d63eb..87ec123dfc4cda3f94eebf840749651d1295cf97 100644 (file)
--- 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 2e8533e1bf0c2ad49905815417dc4a8688e12f5c..d990a1ae8f81c0d623f705327a0120ff77102d57 100644 (file)
--- 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 {