Skip to content

Commit d371edd

Browse files
committed
Lint now fails on warnings, rocketships aligned
A weird case we're not sure about in params.pp with a ${username} appearing, we're not really sure what it does or why its there. There are lint-control flags around it until we know more.
1 parent ae876f6 commit d371edd

File tree

5 files changed

+34
-31
lines changed

5 files changed

+34
-31
lines changed

Rakefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ PuppetLint.configuration.send('disable_class_inherits_from_params_class')
77
PuppetLint.configuration.send('disable_class_parameter_defaults')
88
PuppetLint.configuration.send('disable_documentation')
99
PuppetLint.configuration.send('disable_single_quote_string_with_variables')
10+
PuppetLint.configuration.fail_on_warnings = true
1011
PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]

manifests/config.pp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,17 @@
5454
}
5555

5656
file { '/etc/rabbitmq':
57-
ensure => directory,
58-
owner => '0',
59-
group => '0',
60-
mode => '0644',
57+
ensure => directory,
58+
owner => '0',
59+
group => '0',
60+
mode => '0644',
6161
}
6262

6363
file { '/etc/rabbitmq/ssl':
64-
ensure => directory,
65-
owner => '0',
66-
group => '0',
67-
mode => '0644',
64+
ensure => directory,
65+
owner => '0',
66+
group => '0',
67+
mode => '0644',
6868
}
6969

7070
file { 'rabbitmq.config':
@@ -107,8 +107,8 @@
107107
# Safety check.
108108
if $wipe_db_on_cookie_change {
109109
exec { 'wipe_db':
110-
command => "puppet resource service ${service_name} ensure=stopped; rm -rf /var/lib/rabbitmq/mnesia",
111-
path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
110+
command => "puppet resource service ${service_name} ensure=stopped; rm -rf /var/lib/rabbitmq/mnesia",
111+
path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
112112
}
113113
File['erlang_cookie'] {
114114
require => Exec['wipe_db'],

manifests/install/rabbitmqadmin.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
$protocol = $rabbitmq::ssl ? { false => 'http', default => 'https' }
88

99
staging::file { 'rabbitmqadmin':
10-
target => '/var/lib/rabbitmq/rabbitmqadmin',
11-
source => "${protocol}://${default_user}:${default_pass}@localhost:${management_port}/cli/rabbitmqadmin",
10+
target => '/var/lib/rabbitmq/rabbitmqadmin',
11+
source => "${protocol}://${default_user}:${default_pass}@localhost:${management_port}/cli/rabbitmqadmin",
1212
curl_option => '--noproxy localhost',
1313
wget_option => '--no-proxy',
14-
require => [
14+
require => [
1515
Class['rabbitmq::service'],
1616
Rabbitmq_plugin['rabbitmq_management']
1717
],

manifests/params.pp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@
8686
$stomp_ensure = false
8787
$ldap_auth = false
8888
$ldap_server = 'ldap'
89+
# lint:ignore:variable_scope
8990
$ldap_user_dn_pattern = "cn=${username},ou=People,dc=example,dc=com"
91+
# lint:endignore
9092
$ldap_use_ssl = false
9193
$ldap_port = '389'
9294
$ldap_log = false

manifests/server.pp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -78,23 +78,23 @@
7878
}
7979

8080
class { 'rabbitmq':
81-
port => $port,
82-
delete_guest_user => $delete_guest_user,
83-
package_name => $package_name,
84-
version => $version,
85-
service_name => $service_name,
86-
service_ensure => $service_ensure,
87-
service_manage => $_service_manage,
88-
config_stomp => $config_stomp,
89-
stomp_port => $stomp_port,
90-
config_cluster => $config_cluster,
91-
cluster_disk_nodes => $cluster_disk_nodes,
92-
cluster_nodes => $cluster_nodes,
93-
cluster_node_type => $cluster_node_type,
94-
node_ip_address => $node_ip_address,
95-
config => $config,
96-
env_config => $env_config,
97-
erlang_cookie => $erlang_cookie,
98-
wipe_db_on_cookie_change => $wipe_db_on_cookie_change,
81+
port => $port,
82+
delete_guest_user => $delete_guest_user,
83+
package_name => $package_name,
84+
version => $version,
85+
service_name => $service_name,
86+
service_ensure => $service_ensure,
87+
service_manage => $_service_manage,
88+
config_stomp => $config_stomp,
89+
stomp_port => $stomp_port,
90+
config_cluster => $config_cluster,
91+
cluster_disk_nodes => $cluster_disk_nodes,
92+
cluster_nodes => $cluster_nodes,
93+
cluster_node_type => $cluster_node_type,
94+
node_ip_address => $node_ip_address,
95+
config => $config,
96+
env_config => $env_config,
97+
erlang_cookie => $erlang_cookie,
98+
wipe_db_on_cookie_change => $wipe_db_on_cookie_change,
9999
}
100100
}

0 commit comments

Comments
 (0)