Skip to content

Commit e5835e9

Browse files
committed
Resolve simple puppet-lint notices
1 parent ef64c30 commit e5835e9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+378
-332
lines changed

functions/default.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
#
66
function postgresql::default(
77
String $parameter_name
8-
){
8+
) {
99
include postgresql::params
1010

1111
#search for the variable name in params first
1212
#then fall back to globals if not found
1313
pick( getvar("postgresql::params::${parameter_name}"),
14-
"postgresql::globals::${parameter_name}")
14+
"postgresql::globals::${parameter_name}")
1515
}

manifests/client.pp

-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
String[1] $package_name = $postgresql::params::client_package_name,
1818
String[1] $package_ensure = 'present'
1919
) inherits postgresql::params {
20-
2120
if $package_name != 'UNSET' {
2221
package { 'postgresql-client':
2322
ensure => $package_ensure,
@@ -33,5 +32,4 @@
3332
group => 0,
3433
mode => '0755',
3534
}
36-
3735
}

manifests/globals.pp

+12-12
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,9 @@
150150
) {
151151
# We are determining this here, because it is needed by the package repo
152152
# class.
153-
$default_version = $::osfamily ? {
154-
/^(RedHat|Linux)/ => $::operatingsystem ? {
155-
'Fedora' => $::operatingsystemrelease ? {
153+
$default_version = $facts['os']['family'] ? {
154+
/^(RedHat|Linux)/ => $facts['os']['name'] ? {
155+
'Fedora' => $facts['os']['release']['full'] ? {
156156
/^(32)$/ => '12',
157157
/^(31)$/ => '11.6',
158158
/^(30)$/ => '11.2',
@@ -167,24 +167,24 @@
167167
default => undef,
168168
},
169169
'Amazon' => '9.2',
170-
default => $::operatingsystemrelease ? {
170+
default => $facts['os']['release']['full'] ? {
171171
/^8\./ => '10',
172172
/^7\./ => '9.2',
173173
/^6\./ => '8.4',
174174
/^5\./ => '8.1',
175175
default => undef,
176176
},
177177
},
178-
'Debian' => $::operatingsystem ? {
179-
'Debian' => $::operatingsystemrelease ? {
178+
'Debian' => $facts['os']['name'] ? {
179+
'Debian' => $facts['os']['release']['full'] ? {
180180
/^(squeeze|6\.)/ => '8.4',
181181
/^(wheezy|7\.)/ => '9.1',
182182
/^(jessie|8\.)/ => '9.4',
183183
/^(stretch|9\.)/ => '9.6',
184184
/^(buster|10\.)/ => '11',
185185
default => undef,
186186
},
187-
'Ubuntu' => $::operatingsystemrelease ? {
187+
'Ubuntu' => $facts['os']['release']['full'] ? {
188188
/^(10.04|10.10|11.04)$/ => '8.4',
189189
/^(11.10|12.04|12.10|13.04|13.10)$/ => '9.1',
190190
/^(14.04)$/ => '9.3',
@@ -197,19 +197,19 @@
197197
},
198198
default => undef,
199199
},
200-
'Archlinux' => $::operatingsystem ? {
200+
'Archlinux' => $facts['os']['name'] ? {
201201
/Archlinux/ => '9.2',
202202
default => '9.2',
203203
},
204204
'Gentoo' => '9.5',
205205
'FreeBSD' => '93',
206-
'OpenBSD' => $::operatingsystemrelease ? {
206+
'OpenBSD' => $facts['os']['release']['full'] ? {
207207
/5\.6/ => '9.3',
208208
/5\.[7-9]/ => '9.4',
209209
/6\.[0-9]/ => '9.5',
210210
},
211-
'Suse' => $::operatingsystem ? {
212-
'SLES' => $::operatingsystemrelease ? {
211+
'Suse' => $facts['os']['name'] ? {
212+
'SLES' => $facts['os']['release']['full'] ? {
213213
/11\.[0-3]/ => '91',
214214
/11\.4/ => '94',
215215
/12\.0/ => '93',
@@ -218,7 +218,7 @@
218218
/15\.0/ => '10',
219219
default => '96',
220220
},
221-
'OpenSuSE' => $::operatingsystemrelease ? {
221+
'OpenSuSE' => $facts['os']['release']['full'] ? {
222222
/42\.[1-2]/ => '94',
223223
default => '96',
224224
},

manifests/lib/devel.pp

+2-4
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@
88
# If the bin directory used by the PostgreSQL page is not /usr/bin or /usr/local/bin, symlinks pg_config from the package's bin dir into usr/bin (not applicable to Debian systems). Set to false to disable this behavior.
99
#
1010
#
11-
class postgresql::lib::devel(
11+
class postgresql::lib::devel (
1212
String $package_name = $postgresql::params::devel_package_name,
1313
String[1] $package_ensure = 'present',
1414
Boolean $link_pg_config = $postgresql::params::link_pg_config
1515
) inherits postgresql::params {
16-
17-
if $::osfamily == 'Gentoo' {
16+
if $facts['os']['family'] == 'Gentoo' {
1817
fail('osfamily Gentoo does not have a separate "devel" package, postgresql::lib::devel is not supported')
1918
}
2019

@@ -32,5 +31,4 @@
3231
}
3332
}
3433
}
35-
3634
}

manifests/lib/docs.pp

-2
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@
1313
String $package_name = $postgresql::params::docs_package_name,
1414
String[1] $package_ensure = 'present',
1515
) inherits postgresql::params {
16-
1716
package { 'postgresql-docs':
1817
ensure => $package_ensure,
1918
name => $package_name,
2019
tag => 'puppetlabs-postgresql',
2120
}
22-
2321
}

manifests/lib/java.pp

-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@
1212
String $package_name = $postgresql::params::java_package_name,
1313
String[1] $package_ensure = 'present'
1414
) inherits postgresql::params {
15-
1615
package { 'postgresql-jdbc':
1716
ensure => $package_ensure,
1817
name => $package_name,
1918
tag => 'puppetlabs-postgresql',
2019
}
21-
2220
}

manifests/lib/perl.pp

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@
55
# @param package_ensure
66
# Ensure the perl libs for postgresql are installed.
77
#
8-
class postgresql::lib::perl(
8+
class postgresql::lib::perl (
99
String $package_name = $postgresql::params::perl_package_name,
1010
String[1] $package_ensure = 'present'
1111
) inherits postgresql::params {
12-
1312
package { 'perl-DBD-Pg':
1413
ensure => $package_ensure,
1514
name => $package_name,
1615
tag => 'puppetlabs-postgresql',
1716
}
18-
1917
}

manifests/lib/python.pp

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@
55
# @param package_ensure
66
# Ensure the python libs for postgresql are installed.
77
#
8-
class postgresql::lib::python(
8+
class postgresql::lib::python (
99
String[1] $package_name = $postgresql::params::python_package_name,
1010
String[1] $package_ensure = 'present'
1111
) inherits postgresql::params {
12-
1312
package { 'python-psycopg2':
1413
ensure => $package_ensure,
1514
name => $package_name,
1615
tag => 'puppetlabs-postgresql',
1716
}
18-
1917
}

manifests/params.pp

+18-18
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
$manage_xlogdir = true
3232

3333
# Amazon Linux's OS Family is 'Linux', operating system 'Amazon'.
34-
case $::osfamily {
34+
case $facts['os']['family'] {
3535
'RedHat', 'Linux': {
3636
$link_pg_config = true
3737
$user = pick($user, 'postgres')
@@ -40,7 +40,7 @@
4040
$version_parts = split($version, '[.]')
4141
$package_version = "${version_parts[0]}${version_parts[1]}"
4242

43-
if $version == $postgresql::globals::default_version and $::operatingsystem != 'Amazon' {
43+
if $version == $postgresql::globals::default_version and $facts['os']['name'] != 'Amazon' {
4444
$client_package_name = pick($client_package_name, 'postgresql')
4545
$server_package_name = pick($server_package_name, 'postgresql-server')
4646
$contrib_package_name = pick($contrib_package_name,'postgresql-contrib')
@@ -51,7 +51,7 @@
5151
$plpython_package_name = pick($plpython_package_name, 'postgresql-plpython')
5252
$service_name = pick($service_name, 'postgresql')
5353
$bindir = pick($bindir, '/usr/bin')
54-
$datadir = $::operatingsystem ? {
54+
$datadir = $facts['os']['name'] ? {
5555
'Amazon' => pick($datadir, "/var/lib/pgsql${package_version}/data"),
5656
default => pick($datadir, '/var/lib/pgsql/data'),
5757
}
@@ -65,30 +65,30 @@
6565
$docs_package_name = pick($docs_package_name, "postgresql${package_version}-docs")
6666
$plperl_package_name = pick($plperl_package_name, "postgresql${package_version}-plperl")
6767
$plpython_package_name = pick($plpython_package_name, "postgresql${package_version}-plpython")
68-
$service_name = $::operatingsystem ? {
68+
$service_name = $facts['os']['name'] ? {
6969
'Amazon' => pick($service_name, "postgresql${version_parts[0]}${version_parts[1]}"),
7070
default => pick($service_name, "postgresql-${version}"),
7171
}
72-
$bindir = $::operatingsystem ? {
72+
$bindir = $facts['os']['name'] ? {
7373
'Amazon' => pick($bindir, '/usr/bin'),
7474
default => pick($bindir, "/usr/pgsql-${version}/bin"),
7575
}
76-
$datadir = $::operatingsystem ? {
76+
$datadir = $facts['os']['name'] ? {
7777
'Amazon' => pick($datadir, "/var/lib/pgsql${package_version}/data"),
7878
default => pick($datadir, "/var/lib/pgsql/${version}/data"),
7979
}
8080
$confdir = pick($confdir, $datadir)
8181
}
8282

83-
case $::operatingsystem {
83+
case $facts['os']['name'] {
8484
'Amazon': {
8585
$service_reload = "service ${service_name} reload"
8686
$service_status = "service ${service_name} status"
8787
}
8888

8989
# RHEL 5 uses SysV init, RHEL 6 uses upstart. RHEL 7 and 8 both use systemd.
9090
'RedHat', 'CentOS', 'Scientific', 'OracleLinux': {
91-
if $::operatingsystemrelease =~ /^[78].*/ {
91+
if $facts['os']['release']['full'] =~ /^[78].*/ {
9292
$service_reload = "systemctl reload ${service_name}"
9393
$service_status = "systemctl status ${service_name}"
9494
} else {
@@ -111,7 +111,7 @@
111111

112112
if $postgresql::globals::postgis_package_name {
113113
$postgis_package_name = $postgresql::globals::postgis_package_name
114-
} elsif $::operatingsystemrelease =~ /^5\./ {
114+
} elsif $facts['os']['release']['full'] =~ /^5\./ {
115115
$postgis_package_name = 'postgis'
116116
} elsif $postgis_version and versioncmp($postgis_version, '2') < 0 {
117117
$postgis_package_name = "postgis${package_version}"
@@ -161,9 +161,9 @@
161161
$service_name = pick($service_name, 'postgresql')
162162
} else {
163163
$needs_initdb = pick($needs_initdb, false)
164-
$service_name = $::operatingsystem ? {
164+
$service_name = $facts['os']['name'] ? {
165165
'Debian' => pick($service_name, 'postgresql'),
166-
'Ubuntu' => $::lsbmajdistrelease ? {
166+
'Ubuntu' => $facts['os']['distro']['release']['major'] ? {
167167
/^10/ => pick($service_name, "postgresql-${version}"),
168168
default => pick($service_name, 'postgresql'),
169169
},
@@ -182,12 +182,12 @@
182182
$postgis_package_name = pick($postgis_package_name, "postgresql-${version}-postgis-${postgis_version}")
183183
}
184184
$devel_package_name = pick($devel_package_name, 'libpq-dev')
185-
$java_package_name = $::operatingsystem ? {
186-
'Debian' => $::operatingsystemrelease ? {
185+
$java_package_name = $facts['os']['name'] ? {
186+
'Debian' => $facts['os']['release']['full'] ? {
187187
/^6/ => pick($java_package_name, 'libpg-java'),
188188
default => pick($java_package_name, 'libpostgresql-jdbc-java'),
189189
},
190-
default => pick($java_package_name, 'libpostgresql-jdbc-java'),
190+
default => pick($java_package_name, 'libpostgresql-jdbc-java'),
191191
}
192192
$perl_package_name = pick($perl_package_name, 'libdbd-pg-perl')
193193
$plperl_package_name = pick($plperl_package_name, "postgresql-plperl-${version}")
@@ -197,10 +197,10 @@
197197
$bindir = pick($bindir, "/usr/lib/postgresql/${version}/bin")
198198
$datadir = pick($datadir, "/var/lib/postgresql/${version}/main")
199199
$confdir = pick($confdir, "/etc/postgresql/${version}/main")
200-
if $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '8.0') >= 0 {
200+
if $facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['full'], '8.0') >= 0 {
201201
# Jessie uses systemd
202202
$service_status = pick($service_status, "/usr/sbin/service ${service_name}@*-main status")
203-
} elsif $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '15.04') >= 0 {
203+
} elsif $facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['full'], '15.04') >= 0 {
204204
# Ubuntu releases since vivid use systemd
205205
$service_status = pick($service_status, "/usr/sbin/service ${service_name} status")
206206
} else {
@@ -310,7 +310,7 @@
310310
$bindir = pick($bindir, "/usr/lib/postgresql${version}/bin")
311311
$datadir = pick($datadir, '/var/lib/pgsql/data')
312312
$confdir = pick($confdir, $datadir)
313-
if $::operatingsystem == 'SLES' and versioncmp($::operatingsystemrelease, '11.4') <= 0 {
313+
if $facts['os']['name'] == 'SLES' and versioncmp($facts['os']['release']['full'], '11.4') <= 0 {
314314
$service_status = pick($service_status, "/etc/init.d/${service_name} status")
315315
$service_reload = "/etc/init.d/${service_name} reload"
316316
} else {
@@ -329,7 +329,7 @@
329329
# Since we can't determine defaults on our own, we rely on users setting
330330
# parameters with the postgresql::globals class. Here we are checking
331331
# that the mandatory minimum is set for the module to operate.
332-
$err_prefix = "Module ${module_name} does not provide defaults for osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}; please specify a value for ${module_name}::globals::"
332+
$err_prefix = "Module ${module_name} does not provide defaults for osfamily: ${facts['os']['family']} operatingsystem: ${facts['os']['name']}; please specify a value for ${module_name}::globals::"
333333
if ($needs_initdb == undef) { fail("${err_prefix}needs_initdb") }
334334
if ($service_name == undef) { fail("${err_prefix}service_name") }
335335
if ($client_package_name == undef) { fail("${err_prefix}client_package_name") }

manifests/repo.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$proxy = undef,
55
$baseurl = undef,
66
) {
7-
case $::osfamily {
7+
case $facts['os']['family'] {
88
'RedHat', 'Linux': {
99
if $version == undef {
1010
fail("The parameter 'version' for 'postgresql::repo' is undefined. You must always define it when osfamily == Redhat or Linux")
@@ -17,7 +17,7 @@
1717
}
1818

1919
default: {
20-
fail("Unsupported managed repository for osfamily: ${::osfamily}, operatingsystem: ${::operatingsystem}, module ${module_name} currently only supports managing repos for osfamily RedHat and Debian")
20+
fail("Unsupported managed repository for osfamily: ${facts['os']['family']}, operatingsystem: ${facts['os']['name']}, module ${module_name} currently only supports managing repos for osfamily RedHat and Debian")
2121
}
2222
}
2323
}

manifests/repo/apt_postgresql_org.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# @api private
22
class postgresql::repo::apt_postgresql_org inherits postgresql::repo {
3-
include ::apt
3+
include apt
44

55
# Here we have tried to replicate the instructions on the PostgreSQL site:
66
#
@@ -16,7 +16,7 @@
1616
}
1717
-> apt::source { 'apt.postgresql.org':
1818
location => $_baseurl,
19-
release => "${::lsbdistcodename}-pgdg",
19+
release => "${facts['os']['distro']['codename']}-pgdg",
2020
repos => "main ${postgresql::repo::version}",
2121
key => {
2222
id => 'B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8',

manifests/repo/yum_postgresql_org.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
owner => 'root',
1010
group => 'root',
1111
mode => '0644',
12-
before => Yumrepo['yum.postgresql.org']
12+
before => Yumrepo['yum.postgresql.org'],
1313
}
1414

15-
if($::operatingsystem == 'Fedora') {
15+
if($facts['os']['name'] == 'Fedora') {
1616
$label1 = 'fedora'
1717
$label2 = $label1
1818
} else {

manifests/server.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
$_version = $postgresql::params::version
156156
}
157157

158-
if $createdb_path != undef{
158+
if $createdb_path != undef {
159159
warning('Passing "createdb_path" to postgresql::server is deprecated, it can be removed safely for the same behaviour')
160160
}
161161

0 commit comments

Comments
 (0)