From: Jonathan Tripathy <jt@puppetlabs.com>
Date: Thu, 3 Dec 2015 15:42:48 +0000 (+0000)
Subject: Updated logic to debian manifest file
X-Git-Tag: 1.7.2~1^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d3d44ae54a352179c856bcfdcfc40049c03f93db;p=puppet-modules%2Fpuppetlabs-firewall.git

Updated logic to debian manifest file
---

diff --git a/manifests/linux/debian.pp b/manifests/linux/debian.pp
index d7941e2..a24d3ab 100644
--- a/manifests/linux/debian.pp
+++ b/manifests/linux/debian.pp
@@ -32,7 +32,7 @@ class firewall::linux::debian (
     }
   }
 
-  if($::operatingsystemrelease =~ /^6\./ and $enable == true
+  if($::operatingsystemrelease =~ /^6\./ and $enable == true and $::iptables_persistent_version
   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
diff --git a/spec/acceptance/nodesets/new/pe/debian-6-64mda.yml b/spec/acceptance/nodesets/new/pe/debian-6-64mda.yml
index 2ea646a..3101a5a 100644
--- a/spec/acceptance/nodesets/new/pe/debian-6-64mda.yml
+++ b/spec/acceptance/nodesets/new/pe/debian-6-64mda.yml
@@ -24,4 +24,4 @@ CONFIG:
   resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
   pooling_api: http://vcloud.delivery.puppetlabs.net/
   ssh:
-    timeout: 600
\ No newline at end of file
+    timeout: 600