Merge pull request redhat-openstack#248 from pdxcat/fix_lint_warnings

Fix Rakefile to enforce failure on warnings
xbezdick · Apr 4, 2015 · a47ffaf · a47ffaf
2 parents d526993 + 70eb150
commit a47ffaf
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 27 deletions.
diff --git 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('disable_80chars')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')
 PuppetLint.configuration.send('disable_class_parameter_defaults')

diff --git a/manifests/plugin/curl_json.pp b/manifests/plugin/curl_json.pp
@@ -3,6 +3,7 @@
   $url,
   $instance,
   $keys,
+  $ensure   = present,
   $user     = undef,
   $password = undef,
   $order = '10',

diff --git a/manifests/plugin/exec.pp b/manifests/plugin/exec.pp
@@ -16,8 +16,8 @@
 
   # This is deprecated file naming ensuring old style file removed, and should be removed in next major relese
   file { "${name}.load-deprecated":
-    path => "${conf_dir}/${name}.conf",
     ensure => absent,
+    path   => "${conf_dir}/${name}.conf",
   }
   # End deprecation
 

diff --git a/manifests/plugin/genericjmx/connection.pp b/manifests/plugin/genericjmx/connection.pp
@@ -1,11 +1,11 @@
 # https://collectd.org/wiki/index.php/Plugin:GenericJMX
 define collectd::plugin::genericjmx::connection (
-  $host = $name,
+  $collect,
   $service_url,
+  $host = $name,
   $user = undef,
   $password = undef,
   $instance_prefix = undef,
-  $collect,
 ) {
   include collectd::plugin::genericjmx
   concat::fragment { "collectd_plugin_genericjmx_conf_${name}":

diff --git a/manifests/plugin/genericjmx/mbean.pp b/manifests/plugin/genericjmx/mbean.pp
@@ -1,9 +1,9 @@
 # https://collectd.org/wiki/index.php/Plugin:GenericJMX
 define collectd::plugin::genericjmx::mbean (
   $object_name,
+  $values,
   $instance_prefix = undef,
   $instance_from = undef,
-  $values,
 ) {
   include collectd::plugin::genericjmx
   validate_array($values)

diff --git a/manifests/plugin/mysql.pp b/manifests/plugin/mysql.pp
@@ -1,6 +1,7 @@
 # MySQL plugin
 # https://collectd.org/wiki/index.php/Plugin:MySQL
 class collectd::plugin::mysql (
+  $ensure = present,
   $interval = undef,
 ){
 

diff --git a/manifests/plugin/ping.pp b/manifests/plugin/ping.pp
@@ -1,6 +1,7 @@
 # See http://collectd.org/documentation/manpages/collectd.conf.5.shtml#plugin_ping
 define collectd::plugin::ping (
   $hosts,
+  $ensure         = present,
   $interval       = undef,
   $timeout        = undef,
   $ttl            = undef,

diff --git a/manifests/plugin/snmp/data.pp b/manifests/plugin/snmp/data.pp
@@ -1,10 +1,10 @@
 # https://collectd.org/wiki/index.php/Plugin:SNMP
 define collectd::plugin::snmp::data (
-  $ensure = present,
-  $type,
-  $table = false,
   $instance,
+  $type,
   $values,
+  $ensure = present,
+  $table = false,
 ) {
   include collectd
   include collectd::plugin::snmp

diff --git a/manifests/plugin/snmp/host.pp b/manifests/plugin/snmp/host.pp
@@ -1,10 +1,10 @@
 # https://collectd.org/wiki/index.php/Plugin:SNMP
 define collectd::plugin::snmp::host (
+  $collect,
   $ensure = present,
   $address = $name,
   $version = 1,
   $community = 'public',
-  $collect,
   $interval = undef,
 ) {
   include collectd

diff --git a/tests/plugins/iptables.pp b/tests/plugins/iptables.pp
@@ -1,7 +1,7 @@
 include collectd
 
 class { 'collectd::plugin::iptables':
-  chains  => {
+  chains => {
     'nat'    => 'In_SSH',
     'filter' => 'HTTP'
   },

diff --git a/tests/plugins/mysql.pp b/tests/plugins/mysql.pp
@@ -1,8 +1,8 @@
 include collectd
 
 collectd::plugin::mysql::database { 'puppetdb':
-  host        => 'localhost',
-  username    => 'stahmna',
-  password    => 'yermom',
-  port        => '3306',
+  host     => 'localhost',
+  username => 'stahmna',
+  password => 'yermom',
+  port     => '3306',
 }
diff --git a/tests/plugins/perl.pp b/tests/plugins/perl.pp
@@ -16,8 +16,8 @@
   destination => '/tmp',
   order       => 99,
   config      => {
-    'foo'     => 'bar',
-    'key'     => [ 'val1', 'val2' ],
+    'foo' => 'bar',
+    'key' => [ 'val1', 'val2' ],
   }
 }
 
@@ -37,17 +37,17 @@
 
 collectd::plugin::perl::plugin {
   'baar':
-    module        => 'Collectd::Plugins::Bar',
-    provider      => 'package',
-    source        => 'perl-Collectd-Plugins-Bar',
-    config        => {
-      'foo'       => 'bar',
-      'more'      => {
+    module   => 'Collectd::Plugins::Bar',
+    provider => 'package',
+    source   => 'perl-Collectd-Plugins-Bar',
+    config   => {
+      'foo'  => 'bar',
+      'more' => {
         'complex' => 'structure',
         'no'      => [ 'a', 'b' ],
         'yes'     => {
-          'last'  => 'level',
-          'and'   => [ 'array' , 'thing' ]
+          'last' => 'level',
+          'and'  => [ 'array' , 'thing' ]
         },
       },
     },

diff --git a/tests/purge_config.pp b/tests/purge_config.pp
@@ -1,7 +1,7 @@
 class { 'collectd':
-  purge         => true,
-  recurse       => true,
-  purge_config  => true,
+  purge        => true,
+  recurse      => true,
+  purge_config => true,
 }