Merge pull request #441 from mhaskel/MODULES-1572

MODULES-1572 - Fix logic broken from MODULES-1309
strider · Dec 12, 2014 · 902abe5 · 902abe5
2 parents 778ee8b + 12874e2
commit 902abe5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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 {