Skip to content

Commit 9e9b38b

Browse files
smortexsmortex
committed
Pet puppet-lint
1 parent 4a58709 commit 9e9b38b

File tree

8 files changed

+14
-56
lines changed

8 files changed

+14
-56
lines changed

‎manifests/config.pp‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,18 @@
1212
# @author Gavin Williams <[email protected]>
1313
#
1414
class elasticsearch::config {
15-
1615
#### Configuration
1716

1817
Exec {
19-
path => [ '/bin', '/usr/bin', '/usr/local/bin' ],
18+
path => ['/bin', '/usr/bin', '/usr/local/bin'],
2019
cwd => '/',
2120
}
2221

23-
$init_defaults = merge(
24-
{
25-
'MAX_OPEN_FILES' => '65535',
26-
},
27-
$elasticsearch::init_defaults
28-
)
29-
30-
if ( $elasticsearch::ensure == 'present' ) {
22+
$init_defaults = {
23+
'MAX_OPEN_FILES' => '65535',
24+
}.merge($elasticsearch::init_defaults)
3125

26+
if ($elasticsearch::ensure == 'present') {
3227
file {
3328
$elasticsearch::homedir:
3429
ensure => 'directory',
@@ -206,10 +201,9 @@
206201
configdir => $elasticsearch::configdir,
207202
purge => $elasticsearch::purge_secrets,
208203
settings => $elasticsearch::secrets,
209-
notify => $::elasticsearch::_notify_service,
204+
notify => $elasticsearch::_notify_service,
210205
}
211206
}
212-
213207
} elsif ( $elasticsearch::ensure == 'absent' ) {
214208
file { $elasticsearch::real_plugindir:
215209
ensure => 'absent',

‎manifests/index.pp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
Hash $settings = {},
5656
Boolean $validate_tls = $elasticsearch::validate_tls,
5757
) {
58-
5958
es_instance_conn_validator { "${name}-index-conn-validator":
6059
server => $api_host,
6160
port => $api_port,

‎manifests/init.pp‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,6 @@
405405
Boolean $restart_package_change = $restart_on_change,
406406
Boolean $restart_plugin_change = $restart_on_change,
407407
) {
408-
409408
#### Validate parameters
410409

411410
if ($package_url != undef and $version != false) {
@@ -477,15 +476,14 @@
477476

478477
Class['elastic_stack::repo']
479478
-> Class['elasticsearch::package']
480-
481479
} else {
482480
# Use staging for ordering
483481
if !(defined(Stage[$repo_stage])) {
484482
stage { $repo_stage: before => Stage['main'] }
485483
}
486484

487485
include elastic_stack::repo
488-
Class<|title == 'elastic_stack::repo'|>{
486+
Class<|title == 'elastic_stack::repo'|> {
489487
stage => $repo_stage,
490488
}
491489
}
@@ -507,7 +505,6 @@
507505
if defined(Class['java']) { Class['java'] -> Class['elasticsearch::config'] }
508506

509507
if $ensure == 'present' {
510-
511508
# Installation, configuration and service
512509
Class['elasticsearch::package']
513510
-> Class['elasticsearch::config']
@@ -537,9 +534,7 @@
537534
-> Elasticsearch::Index <| |>
538535
Class['elasticsearch::config']
539536
-> Elasticsearch::Snapshot_repository <| |>
540-
541537
} else {
542-
543538
# Absent; remove configuration before the package.
544539
Class['elasticsearch::config']
545540
-> Class['elasticsearch::package']
@@ -559,7 +554,6 @@
559554
-> Class['elasticsearch::config']
560555
Elasticsearch::Snapshot_repository <| |>
561556
-> Class['elasticsearch::config']
562-
563557
}
564558

565559
# Install plugins before managing users/roles

‎manifests/package.pp‎

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,14 @@
1111
# @author Tyler Langlois <[email protected]>
1212
#
1313
class elasticsearch::package {
14-
1514
Exec {
16-
path => [ '/bin', '/usr/bin', '/usr/local/bin' ],
15+
path => ['/bin', '/usr/bin', '/usr/local/bin'],
1716
cwd => '/',
1817
tries => 3,
1918
try_sleep => 10,
2019
}
2120

2221
if $elasticsearch::ensure == 'present' {
23-
2422
if $elasticsearch::restart_package_change {
2523
Package['elasticsearch'] ~> Class['elasticsearch::service']
2624
}
@@ -45,24 +43,19 @@
4543

4644
# Check if we want to install a specific version or not
4745
if $elasticsearch::version == false {
48-
4946
$package_ensure = $elasticsearch::autoupgrade ? {
5047
true => 'latest',
5148
false => 'present',
5249
}
53-
5450
} else {
55-
5651
# install specific version
5752
$package_ensure = $elasticsearch::pkg_version
58-
5953
}
6054

6155
# action
6256
if ($elasticsearch::package_url != undef) {
63-
6457
case $elasticsearch::package_provider {
65-
'package': { $before = Package['elasticsearch'] }
58+
'package': { $before = Package['elasticsearch'] }
6659
default: { fail("software provider \"${elasticsearch::package_provider}\".") }
6760
}
6861

@@ -78,20 +71,16 @@
7871
$pkg_source = "${package_dir}/${basefilename}"
7972

8073
case $protocol_type {
81-
8274
'puppet': {
83-
8475
file { $pkg_source:
8576
ensure => file,
8677
source => $elasticsearch::package_url,
8778
require => File[$package_dir],
8879
backup => false,
8980
before => $before,
9081
}
91-
9282
}
9383
'ftp', 'https', 'http': {
94-
9584
if $elasticsearch::proxy_url != undef {
9685
$exec_environment = [
9786
'use_proxy=yes',
@@ -123,10 +112,8 @@
123112
fail("no \$elasticsearch::download_tool defined for ${facts['os']['family']}")
124113
}
125114
}
126-
127115
}
128116
'file': {
129-
130117
$source_path = $source_array[1]
131118
file { $pkg_source:
132119
ensure => file,
@@ -135,32 +122,26 @@
135122
backup => false,
136123
before => $before,
137124
}
138-
139125
}
140126
default: {
141127
fail("Protocol must be puppet, file, http, https, or ftp. You have given \"${protocol_type}\"")
142128
}
143129
}
144130

145131
if ($elasticsearch::package_provider == 'package') {
146-
147132
case $ext {
148133
'deb': { Package { provider => 'dpkg', source => $pkg_source } }
149134
'rpm': { Package { provider => 'rpm', source => $pkg_source } }
150135
default: { fail("Unknown file extention \"${ext}\".") }
151136
}
152-
153137
}
154-
155138
} else {
156139
if ($elasticsearch::manage_repo and $facts['os']['family'] == 'Debian') {
157140
Class['apt::update'] -> Package['elasticsearch']
158141
}
159142
}
160-
161-
# Package removal
162143
} else {
163-
144+
# Package removal
164145
if ($facts['os']['family'] == 'Suse') {
165146
Package {
166147
provider => 'rpm',
@@ -169,11 +150,9 @@
169150
} else {
170151
$package_ensure = 'purged'
171152
}
172-
173153
}
174154

175155
if ($elasticsearch::package_provider == 'package') {
176-
177156
package { 'elasticsearch':
178157
ensure => $package_ensure,
179158
name => $elasticsearch::_package_name,
@@ -183,10 +162,7 @@
183162
refreshonly => true,
184163
command => "rm -rf ${elasticsearch::real_plugindir}",
185164
}
186-
187-
188165
} else {
189166
fail("\"${elasticsearch::package_provider}\" is not supported")
190167
}
191-
192168
}

‎manifests/pipeline.pp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
Hash $content = {},
5858
Boolean $validate_tls = $elasticsearch::validate_tls,
5959
) {
60-
6160
es_instance_conn_validator { "${name}-ingest-pipeline":
6261
server => $api_host,
6362
port => $api_port,

‎manifests/plugin.pp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
Optional[String] $source = undef,
6969
Optional[Stdlib::HTTPUrl] $url = undef,
7070
) {
71-
7271
include elasticsearch
7372

7473
case $ensure {
@@ -80,7 +79,8 @@
8079
$_file_ensure = $ensure
8180
$_file_before = File[$elasticsearch::real_plugindir]
8281
}
83-
default: { }
82+
default: {
83+
}
8484
}
8585

8686
# set proxy by override or parse and use proxy_url from
@@ -100,7 +100,6 @@
100100
}
101101

102102
if ($source != undef) {
103-
104103
$filename_array = split($source, '/')
105104
$basefilename = $filename_array[-1]
106105

@@ -111,7 +110,6 @@
111110
source => $source,
112111
before => Elasticsearch_plugin[$name],
113112
}
114-
115113
} else {
116114
$file_source = undef
117115
}

‎manifests/service.pp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@
1010
# @author Gavin Williams <[email protected]>
1111
#
1212
class elasticsearch::service {
13-
1413
#### Service management
1514

1615
if $elasticsearch::ensure == 'present' {
17-
1816
case $elasticsearch::status {
1917
# make sure service is currently running, start it on boot
2018
'enabled': {
@@ -37,7 +35,8 @@
3735
$_service_ensure = undef
3836
$_service_enable = false
3937
}
40-
default: { }
38+
default: {
39+
}
4140
}
4241
} else {
4342
# make sure the service is stopped and disabled (the removal itself will be

‎manifests/snapshot_repository.pp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
Optional[String] $repository_type = undef,
7878
Boolean $validate_tls = $elasticsearch::validate_tls,
7979
) {
80-
8180
es_instance_conn_validator { "${name}-snapshot":
8281
server => $api_host,
8382
port => $api_port,

0 commit comments

Comments
 (0)