From d9ca4564ecc7fcdda52a70d7083801ccbe8b6f93 Mon Sep 17 00:00:00 2001
From: Matthew Wagoner <matthew.wagoner@hp.com>
Date: Fri, 26 Oct 2012 14:36:46 -0400
Subject: [PATCH] Cleanup snmpd manifest init.pp lint errors.

Change-Id: I970c492c11d91dfab3b206859a72598a16602a24
Reviewed-on: https://review.openstack.org/14906
Reviewed-by: Paul Belanger <paul.belanger@polybeacon.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
---
 modules/snmpd/manifests/init.pp | 62 ++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/modules/snmpd/manifests/init.pp b/modules/snmpd/manifests/init.pp
index 97553fa67a..99a5e965dd 100644
--- a/modules/snmpd/manifests/init.pp
+++ b/modules/snmpd/manifests/init.pp
@@ -1,30 +1,36 @@
+# == Class: snmpd
+#
 class snmpd {
-    package { snmpd: ensure => present }
-    service { snmpd:
-      ensure          => running,
-      hasrestart      => true,
-      require => [File["/etc/snmp/snmpd.conf"],
-                  File["/etc/init.d/snmpd"]]
-    }
-    # This file is only needed on machines pre-precise. There is a bug in
-    # the previous init script versions which causes them to attempt
-    # snmptrapd even if it's configured not to run, and then to report
-    # failure.
-    file { "/etc/init.d/snmpd":
-      owner => 'root',
-      group => 'root',
-      mode => 755,
-      ensure => 'present',
-      source => 'puppet:///modules/snmpd/snmpd.init',
-      replace => 'true',
-      require => Package[snmpd]
-    }
-    file { "/etc/snmp/snmpd.conf":
-      owner => 'root',
-      group => 'root',
-      mode => 444,
-      ensure => 'present',
-      source => 'puppet:///modules/snmpd/snmpd.conf',
-      replace => 'true',
-    }
+  package { 'snmpd':
+    ensure => present,
+  }
+  service { 'snmpd':
+    ensure     => running,
+    hasrestart => true,
+    require    => [
+      File['/etc/snmp/snmpd.conf'],
+      File['/etc/init.d/snmpd'],
+    ],
+  }
+  # This file is only needed on machines pre-precise. There is a bug in
+  # the previous init script versions which causes them to attempt
+  # snmptrapd even if it's configured not to run, and then to report
+  # failure.
+  file { '/etc/init.d/snmpd':
+    ensure  => present,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0755',
+    source  => 'puppet:///modules/snmpd/snmpd.init',
+    replace => true,
+    require => Package['snmpd'],
+  }
+  file { '/etc/snmp/snmpd.conf':
+    ensure  => present,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0444',
+    source  => 'puppet:///modules/snmpd/snmpd.conf',
+    replace => true,
+  }
 }