Skip to content

Commit d2cf8fd

Browse files
bastelfreakbastelfreak
committed
puppet-lint: autofix
1 parent ccaaa18 commit d2cf8fd

File tree

11 files changed

+38
-46
lines changed

11 files changed

+38
-46
lines changed

‎manifests/client.pp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
String $client_package = $gluster::params::client_package,
2727
String $version = $gluster::params::version,
2828
) inherits gluster::params {
29-
3029
class { 'gluster::install':
3130
server => false,
3231
client => true,

‎manifests/init.pp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
# @author Scott Merrill <[email protected]>
3939
# @note Copyright 2014 CoverMyMeds, unless otherwise noted
4040
#
41-
class gluster (
41+
class gluster (
4242
Boolean $client = $gluster::params::install_client,
4343
$client_package = $gluster::params::client_package,
4444
$pool = $gluster::params::pool,
@@ -50,7 +50,6 @@
5050
$version = $gluster::params::version,
5151
Hash[String, Any] $volumes = {},
5252
) inherits ::gluster::params {
53-
5453
class { 'gluster::install':
5554
server => $server,
5655
server_package => $server_package,

‎manifests/install.pp‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@
3333
String $server_package = $gluster::params::server_package,
3434
String $client_package = $gluster::params::client_package,
3535
) inherits gluster::params {
36-
3736
if $repo {
3837
# install the correct repo
39-
if ! defined ( Class['::gluster::repo'] ) {
38+
if ! defined ( Class['::gluster::repo']) {
4039
class { 'gluster::repo':
4140
version => $version,
4241
}
@@ -53,33 +52,41 @@
5352
if $client_package == $server_package {
5453
if $server {
5554
# we use ensure_packages here because on some distributions the client and server package have different names
56-
ensure_packages($server_package, {
57-
ensure => $_version,
58-
tag => 'gluster-packages',
59-
notify => Class['::gluster::service'],
60-
})
55+
ensure_packages($server_package,
56+
{
57+
ensure => $_version,
58+
tag => 'gluster-packages',
59+
notify => Class['::gluster::service'],
60+
}
61+
)
6162
} elsif $client {
62-
ensure_packages($client_package, {
63-
ensure => $_version,
64-
tag => 'gluster-packages',
65-
})
63+
ensure_packages($client_package,
64+
{
65+
ensure => $_version,
66+
tag => 'gluster-packages',
67+
}
68+
)
6669
}
6770
} else {
6871
if $client {
6972
# we use ensure_packages here because on some distributions the client and server package have different names
70-
ensure_packages($client_package, {
71-
ensure => $_version,
72-
tag => 'gluster-packages',
73-
})
73+
ensure_packages($client_package,
74+
{
75+
ensure => $_version,
76+
tag => 'gluster-packages',
77+
}
78+
)
7479
}
7580

7681
if $server {
7782
# we use ensure_packages here because on some distributions the client and server package have different names
78-
ensure_packages($server_package, {
79-
ensure => $_version,
80-
notify => Class['::gluster::service'],
81-
tag => 'gluster-packages',
82-
})
83+
ensure_packages($server_package,
84+
{
85+
ensure => $_version,
86+
notify => Class['::gluster::service'],
87+
tag => 'gluster-packages',
88+
}
89+
)
8390
}
8491
}
8592
}

‎manifests/mount.pp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
Optional[String] $direct_io_mode = undef,
5050
Optional[Boolean] $readdirp = undef,
5151
) {
52-
5352
if $log_level {
5453
$ll = "log-level=${log_level}"
5554
} else {
@@ -80,7 +79,7 @@
8079
$r = undef
8180
}
8281

83-
$mount_options = [ $options, $ll, $lf, $t, $dim, $r, ]
82+
$mount_options = [$options, $ll, $lf, $t, $dim, $r,]
8483
$_options = join(delete_undef_values($mount_options), ',')
8584

8685
mount { $title:

‎manifests/params.pp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# @note Copyright 2014 CoverMyMeds, unless otherwise noted
55
#
66
class gluster::params {
7-
87
# parameters dealing with installation
98
$install_server = true
109
$install_client = true
@@ -63,7 +62,6 @@
6362
}
6463
}
6564

66-
6765
# parameters dealing with a Gluster server instance
6866
$service_enable = true
6967
$service_ensure = true

‎manifests/peer.pp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,13 @@
3838
$pool = 'default',
3939
$fqdn = $facts['networking']['fqdn'],
4040
) {
41-
4241
# we can't do much without the Gluster binary
4342
# but we don't necessarily want the Puppet run to fail if the
4443
# gluster_binary fact is absent!
4544
if getvar('::gluster_binary') {
4645
# we can't join to ourselves, so it only makes sense to operate
4746
# on other gluster servers in the same pool
4847
if $fqdn != $facts['networking']['fqdn'] {
49-
5048
# and we don't want to attach a server that is already a member
5149
# of the current pool
5250
if getvar('::gluster_peer_list') {
@@ -61,8 +59,8 @@
6159
}
6260
if !$already_in_pool {
6361
exec { "gluster peer probe ${title}":
64-
command => "${::gluster_binary} peer probe ${title}",
65-
}
62+
command => "${::gluster_binary} peer probe ${title}",
63+
}
6664
}
6765
}
6866
}

‎manifests/repo/apt.pp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,4 @@
109109
create_resources(apt::source, $repo)
110110

111111
Apt::Source["glusterfs-${version}"] -> Package<| tag == 'gluster-packages' |>
112-
113112
}

‎manifests/repo/yum.pp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@
1919
String $repo_key_source = $gluster::params::repo_gpg_key_source,
2020
Optional[String] $priority = $gluster::params::repo_priority,
2121
) inherits gluster::params {
22-
2322
# CentOS Gluster repo only supports x86_64
2423
if $facts['os']['architecture'] != 'x86_64' {
2524
fail("Architecture ${facts['os']['architecture']} not yet supported for ${facts['os']['name']}.")
2625
}
2726

2827
if $priority {
29-
if ! defined( Package['yum-plugin-priorities'] ) {
28+
if ! defined( Package['yum-plugin-priorities']) {
3029
package { 'yum-plugin-priorities':
3130
ensure => installed,
3231
before => Yumrepo["glusterfs-${facts['os']['architecture']}"],
@@ -50,5 +49,4 @@
5049
}
5150

5251
Yumrepo["glusterfs-${facts['os']['architecture']}"] -> Package<| tag == 'gluster-packages' |>
53-
5452
}

‎manifests/service.pp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
$enable = $gluster::params::service_enable,
2222
$service_name = $gluster::params::service_name,
2323
) inherits ::gluster::params {
24-
2524
service { $service_name :
2625
ensure => $ensure,
2726
enable => $enable,

‎manifests/volume.pp‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
Optional[Integer] $replica = undef,
5454
Optional[Integer] $arbiter = undef,
5555
) {
56-
5756
$_force = if $force {
5857
'force'
5958
} else {
@@ -99,7 +98,7 @@
9998

10099
$args = join(delete($cmd_args, ''), ' ')
101100

102-
if getvar('::gluster_binary'){
101+
if getvar('::gluster_binary') {
103102
# we need the Gluster binary to do anything!
104103

105104
if getvar('::gluster_volume_list') and member( split( $::gluster_volume_list, ',' ), $title ) {
@@ -152,7 +151,6 @@
152151
command => "${::gluster_binary} volume start ${title}",
153152
require => Exec["gluster create volume ${title}"],
154153
}
155-
156154
} elsif $already_exists {
157155
# this volume exists
158156

@@ -204,20 +202,19 @@
204202
}
205203

206204
if $replica and $heal {
207-
# there is a delay after which a brick is added before
208-
# the self heal daemon comes back to life.
209-
# as such, we sleep 5 here before starting the heal
205+
# there is a delay after which a brick is added before
206+
# the self heal daemon comes back to life.
207+
# as such, we sleep 5 here before starting the heal
210208
exec { "gluster heal ${title}":
211209
command => "/bin/sleep 5; ${::gluster_binary} volume heal ${title} full",
212210
require => Exec["gluster add bricks to ${title}"],
213211
}
214212
}
215-
216213
} elsif count($bricks) < $vol_count {
217214
# removing bricks
218-
notify{ 'removing bricks is not currently supported.': }
215+
notify { 'removing bricks is not currently supported.': }
219216
} else {
220-
notify{ "unable to resolve brick changes for Gluster volume ${title}!\nDefined: ${_bricks}\nCurrent: ${vol_bricks}": }
217+
notify { "unable to resolve brick changes for Gluster volume ${title}!\nDefined: ${_bricks}\nCurrent: ${vol_bricks}": }
221218
}
222219
}
223220

0 commit comments

Comments
 (0)