From: Ken Barber <ken@bob.sh>
Date: Mon, 3 Jun 2013 13:22:53 +0000 (+0100)
Subject: Ensure all services have 'hasstatus => true' for Puppet 2.6
X-Git-Tag: 0.3.1~3^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=91475282795ee00c7273930033acbb80cd43ec44;p=puppet-modules%2Fpuppetlabs-firewall.git

Ensure all services have 'hasstatus => true' for Puppet 2.6

We were getting reports of idempotency issues with 2.6, due to missing
hasstatus setting.

Signed-off-by: Ken Barber <ken@bob.sh>
---

diff --git a/manifests/linux/archlinux.pp b/manifests/linux/archlinux.pp
index 1ed1160..ef7991b 100644
--- a/manifests/linux/archlinux.pp
+++ b/manifests/linux/archlinux.pp
@@ -5,11 +5,13 @@ class firewall::linux::archlinux (
   service { 'iptables':
     ensure => $ensure,
     enable => $enable,
+    hasstatus => true,
   }
 
   service { 'ip6tables':
     ensure => $ensure,
     enable => $enable,
+    hasstatus => true,
   }
 
   file { '/etc/iptables/iptables.rules':
diff --git a/manifests/linux/debian.pp b/manifests/linux/debian.pp
index 1470893..1d60156 100644
--- a/manifests/linux/debian.pp
+++ b/manifests/linux/debian.pp
@@ -19,8 +19,9 @@ class firewall::linux::debian (
     # This isn't a real service/daemon. The start action loads rules, so just
     # needs to be called on system boot.
     service { 'iptables-persistent':
-      ensure  => undef,
-      enable  => $enable,
+      ensure => undef,
+      enable => $enable,
+      hasstatus => true,
       require => Package['iptables-persistent'],
     }
   }
diff --git a/manifests/linux/redhat.pp b/manifests/linux/redhat.pp
index c7dcb94..b318193 100644
--- a/manifests/linux/redhat.pp
+++ b/manifests/linux/redhat.pp
@@ -5,5 +5,6 @@ class firewall::linux::redhat (
   service { 'iptables':
     ensure => $ensure,
     enable => $enable,
+    hasstatus => true,
   }
 }