From 78183a1bd2d1873122183531205811a3edd83e5d Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Wed, 18 Mar 2015 15:29:49 -0700
Subject: [PATCH] Fix lint warnings and ensure lint fails on warnings

---
 Rakefile             |  2 +-
 manifests/config.pp  | 16 ++++++++--------
 manifests/install.pp |  6 +++---
 manifests/service.pp | 10 +++++-----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Rakefile b/Rakefile
index e3be95b0..181157e6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,7 +1,7 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 
-PuppetLint.configuration.fail_on_warnings
+PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('relative')
 PuppetLint.configuration.send('disable_80chars')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')
diff --git a/manifests/config.pp b/manifests/config.pp
index 91990ba1..e54feff0 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -1,22 +1,22 @@
 #
 class ntp::config inherits ntp {
 
-  if $keys_enable {
-    $directory = ntp_dirname($keys_file)
+  if $ntp::keys_enable {
+    $directory = ntp_dirname($ntp::keys_file)
     file { $directory:
-      ensure  => directory,
-      owner   => 0,
-      group   => 0,
-      mode    => '0755',
+      ensure => directory,
+      owner  => 0,
+      group  => 0,
+      mode   => '0755',
     }
   }
 
-  file { $config:
+  file { $ntp::config:
     ensure  => file,
     owner   => 0,
     group   => 0,
     mode    => '0644',
-    content => template($config_template),
+    content => template($ntp::config_template),
   }
 
 }
diff --git a/manifests/install.pp b/manifests/install.pp
index 49f4044b..9709d708 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -1,10 +1,10 @@
 #
 class ntp::install inherits ntp {
 
-  if $package_manage {
+  if $ntp::package_manage {
 
-    package { $package_name:
-      ensure => $package_ensure,
+    package { $ntp::package_name:
+      ensure => $ntp::package_ensure,
     }
 
   }
diff --git a/manifests/service.pp b/manifests/service.pp
index 3f1ada0b..6bc951bf 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -1,15 +1,15 @@
 #
 class ntp::service inherits ntp {
 
-  if ! ($service_ensure in [ 'running', 'stopped' ]) {
+  if ! ($ntp::service_ensure in [ 'running', 'stopped' ]) {
     fail('service_ensure parameter must be running or stopped')
   }
 
-  if $service_manage == true {
+  if $ntp::service_manage == true {
     service { 'ntp':
-      ensure     => $service_ensure,
-      enable     => $service_enable,
-      name       => $service_name,
+      ensure     => $ntp::service_ensure,
+      enable     => $ntp::service_enable,
+      name       => $ntp::service_name,
       hasstatus  => true,
       hasrestart => true,
     }