Updated logic to debian manifest file

diff --git a/manifests/linux/debian.pp b/manifests/linux/debian.pp
index d7941e21d35599187c3077b9c26e2a133ddd3d95..a24d3ab1640b4c642c7995a3743c882a5d6fc3dc 100644 (file)
--- 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 2ea646ae49a8211e9af68cb44b3022f2334d7453..3101a5a8eed21797eba359c4d9014900c1f0797a 100644 (file)
--- 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