From ca5b3448f6862ecf68890ae3bf100f06c7e52a3d Mon Sep 17 00:00:00 2001
From: Paul Belanger <paul.belanger@polybeacon.com>
Date: Sun, 11 Nov 2012 14:21:49 -0500
Subject: [PATCH] Puppet lint fixes

Change-Id: I00cfd6765bf3f7acd44263347655228d5a839852
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
Reviewed-on: https://review.openstack.org/15844
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
---
 modules/iptables/manifests/init.pp | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/modules/iptables/manifests/init.pp b/modules/iptables/manifests/init.pp
index 5cbc19dc5a..49f94ba90c 100644
--- a/modules/iptables/manifests/init.pp
+++ b/modules/iptables/manifests/init.pp
@@ -1,13 +1,18 @@
-#http://projects.puppetlabs.com/projects/1/wiki/Module_Iptables_Patterns
-
-class iptables($rules='', $public_tcp_ports=[], $public_udp_ports=[]) {
+# Class: iptables
+#
+# http://projects.puppetlabs.com/projects/1/wiki/Module_Iptables_Patterns
+#
+class iptables(
+  $rules = '',
+  $public_tcp_ports = [],
+  $public_udp_ports = []
+) {
   package { 'iptables-persistent':
     ensure => present,
   }
 
   service { 'iptables-persistent':
-    require => Package['iptables-persistent'],
-
+    require    => Package['iptables-persistent'],
     # Because there is no running process for this service, the normal status
     # checks fail.  Because puppet then thinks the service has been manually
     # stopped, it won't restart it.  This fake status command will trick puppet
@@ -15,11 +20,9 @@ class iptables($rules='', $public_tcp_ports=[], $public_udp_ports=[]) {
     # iptables is part of the kernel.)
     hasstatus  => true,
     status     => true,
-
     # Under Debian, the "restart" parameter does not reload the rules, so tell
     # Puppet to fall back to stop/start, which does work.
     hasrestart => false,
-
   }
 
   file { '/etc/iptables':
@@ -27,11 +30,15 @@ class iptables($rules='', $public_tcp_ports=[], $public_udp_ports=[]) {
   }
 
   file { '/etc/iptables/rules':
+    ensure  => present,
     owner   => 'root',
     group   => 'root',
     mode    => '0640',
     content => template('iptables/rules.erb'),
-    require => [Package['iptables-persistent'], File['/etc/iptables']],
+    require => [
+      Package['iptables-persistent'],
+      File['/etc/iptables'],
+    ],
     # When this file is updated, make sure the rules get reloaded.
     notify  => Service['iptables-persistent'],
   }
@@ -47,11 +54,15 @@ class iptables($rules='', $public_tcp_ports=[], $public_udp_ports=[]) {
   }
 
   file { '/etc/iptables/rules.v6':
+    ensure  => present,
     owner   => 'root',
     group   => 'root',
     mode    => '0640',
     content => template('iptables/rules.v6.erb'),
-    require => [Package['iptables-persistent'], File['/etc/iptables']],
+    require => [
+      Package['iptables-persistent'],
+      File['/etc/iptables'],
+    ],
     # When this file is updated, make sure the rules get reloaded.
     notify  => Service['iptables-persistent'],
     replace => true,