Merge pull request redhat-openstack#268 from nibalizer/lint_checks

Lint now fails on warnings, rocketships aligned
xbezdick · Dec 5, 2014 · 00f6472 · 00f6472
2 parents f7b1f33 + d371edd
commit 00f6472
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 31 deletions.
diff --git a/Rakefile b/Rakefile
@@ -7,4 +7,5 @@ PuppetLint.configuration.send('disable_class_inherits_from_params_class')
 PuppetLint.configuration.send('disable_class_parameter_defaults')
 PuppetLint.configuration.send('disable_documentation')
 PuppetLint.configuration.send('disable_single_quote_string_with_variables')
+PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -54,17 +54,17 @@
   }
 
   file { '/etc/rabbitmq':
-    ensure  => directory,
-    owner   => '0',
-    group   => '0',
-    mode    => '0644',
+    ensure => directory,
+    owner  => '0',
+    group  => '0',
+    mode   => '0644',
   }
 
   file { '/etc/rabbitmq/ssl':
-    ensure  => directory,
-    owner   => '0',
-    group   => '0',
-    mode    => '0644',
+    ensure => directory,
+    owner  => '0',
+    group  => '0',
+    mode   => '0644',
   }
 
   file { 'rabbitmq.config':
@@ -107,8 +107,8 @@
       # Safety check.
       if $wipe_db_on_cookie_change {
         exec { 'wipe_db':
-          command    => "puppet resource service ${service_name} ensure=stopped; rm -rf /var/lib/rabbitmq/mnesia",
-          path       => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
+          command => "puppet resource service ${service_name} ensure=stopped; rm -rf /var/lib/rabbitmq/mnesia",
+          path    => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
         }
         File['erlang_cookie'] {
           require => Exec['wipe_db'],

diff --git a/manifests/install/rabbitmqadmin.pp b/manifests/install/rabbitmqadmin.pp
@@ -7,11 +7,11 @@
   $protocol = $rabbitmq::ssl ? { false => 'http', default => 'https' }
 
   staging::file { 'rabbitmqadmin':
-    target  => '/var/lib/rabbitmq/rabbitmqadmin',
-    source  => "${protocol}://${default_user}:${default_pass}@localhost:${management_port}/cli/rabbitmqadmin",
+    target      => '/var/lib/rabbitmq/rabbitmqadmin',
+    source      => "${protocol}://${default_user}:${default_pass}@localhost:${management_port}/cli/rabbitmqadmin",
     curl_option => '--noproxy localhost',
     wget_option => '--no-proxy',
-    require => [
+    require     => [
       Class['rabbitmq::service'],
       Rabbitmq_plugin['rabbitmq_management']
     ],

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -86,7 +86,9 @@
   $stomp_ensure               = false
   $ldap_auth                  = false
   $ldap_server                = 'ldap'
+  # lint:ignore:variable_scope
   $ldap_user_dn_pattern       = "cn=${username},ou=People,dc=example,dc=com"
+  # lint:endignore
   $ldap_use_ssl               = false
   $ldap_port                  = '389'
   $ldap_log                   = false

diff --git a/manifests/server.pp b/manifests/server.pp
@@ -78,23 +78,23 @@
   }
 
   class { 'rabbitmq':
-    port                      => $port,
-    delete_guest_user         => $delete_guest_user,
-    package_name              => $package_name,
-    version                   => $version,
-    service_name              => $service_name,
-    service_ensure            => $service_ensure,
-    service_manage            => $_service_manage,
-    config_stomp              => $config_stomp,
-    stomp_port                => $stomp_port,
-    config_cluster            => $config_cluster,
-    cluster_disk_nodes        => $cluster_disk_nodes,
-    cluster_nodes             => $cluster_nodes,
-    cluster_node_type         => $cluster_node_type,
-    node_ip_address           => $node_ip_address,
-    config                    => $config,
-    env_config                => $env_config,
-    erlang_cookie             => $erlang_cookie,
-    wipe_db_on_cookie_change  => $wipe_db_on_cookie_change,
+    port                     => $port,
+    delete_guest_user        => $delete_guest_user,
+    package_name             => $package_name,
+    version                  => $version,
+    service_name             => $service_name,
+    service_ensure           => $service_ensure,
+    service_manage           => $_service_manage,
+    config_stomp             => $config_stomp,
+    stomp_port               => $stomp_port,
+    config_cluster           => $config_cluster,
+    cluster_disk_nodes       => $cluster_disk_nodes,
+    cluster_nodes            => $cluster_nodes,
+    cluster_node_type        => $cluster_node_type,
+    node_ip_address          => $node_ip_address,
+    config                   => $config,
+    env_config               => $env_config,
+    erlang_cookie            => $erlang_cookie,
+    wipe_db_on_cookie_change => $wipe_db_on_cookie_change,
   }
 }