Skip to content

Commit c2077a3

Browse files
committed
(maint) correct lint issues found on forge
1 parent 9032cd4 commit c2077a3

File tree

5 files changed

+31
-34
lines changed

5 files changed

+31
-34
lines changed

Diff for: .puppet-lint.rc

-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
--relative
2-
--no-2sp_soft_tabs-check
3-
--no-arrow_alignment-check

Diff for: manifests/init.pp

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
if $manage_postgresql_settings and (versioncmp('2018.1.0', $facts['pe_server_version']) > 0) {
3030
include pe_databases::postgresql_settings
3131
class { 'pe_databases::postgresql_settings::table_settings' :
32-
manage_reports_autovacuum_cost_delay => $pe_databases::postgresql_settings::manage_reports_autovacuum_cost_delay,
33-
factsets_autovacuum_vacuum_scale_factor => $pe_databases::postgresql_settings::factsets_autovacuum_vacuum_scale_factor,
34-
reports_autovacuum_vacuum_scale_factor => $pe_databases::postgresql_settings::reports_autovacuum_vacuum_scale_factor,
35-
require => Class['pe_databases::postgresql_settings'],
32+
manage_reports_autovacuum_cost_delay => $pe_databases::postgresql_settings::manage_reports_autovacuum_cost_delay,
33+
factsets_autovacuum_vacuum_scale_factor => $pe_databases::postgresql_settings::factsets_autovacuum_vacuum_scale_factor,
34+
reports_autovacuum_vacuum_scale_factor => $pe_databases::postgresql_settings::reports_autovacuum_vacuum_scale_factor,
35+
require => Class['pe_databases::postgresql_settings'],
3636
}
3737
} elsif $manage_table_settings {
3838
# This is to provide for situations, like PE XL,

Diff for: manifests/maintenance/pg_repack.pp

+13-11
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818

1919
$postgresql_version = $facts['pe_postgresql_info']['installed_server_version']
2020
$repack_executable = versioncmp('2019.1.0', $facts['pe_server_version']) ? {
21-
1 => '/opt/puppetlabs/server/apps/postgresql/bin/pg_repack',
22-
default => "/opt/puppetlabs/server/apps/postgresql/${$postgresql_version}/bin/pg_repack" }
21+
1 => '/opt/puppetlabs/server/apps/postgresql/bin/pg_repack',
22+
default => "/opt/puppetlabs/server/apps/postgresql/${$postgresql_version}/bin/pg_repack"
23+
}
2324

2425
$repack = "su - pe-postgres -s /bin/bash -c \"${repack_executable} -d pe-puppetdb"
2526
$repack_jobs = "--jobs ${jobs}"
@@ -28,8 +29,9 @@
2829
$catalogs_tables = '-t catalogs -t catalog_resources -t edges -t certnames"'
2930
$other_tables = '-t producers -t resource_params -t resource_params_cache"'
3031
$reports_tables = versioncmp('2019.1.0', $facts['pe_server_version']) ? {
31-
1 => '-t reports"',
32-
default => '-t reports -t resource_events"' }
32+
1 => '-t reports"',
33+
default => '-t reports -t resource_events"'
34+
}
3335
$logging = "> ${logging_directory}/output.log 2>&1"
3436

3537
Cron {
@@ -40,16 +42,16 @@
4042

4143
cron { 'pg_repack facts tables' :
4244
weekday => [2,6],
43-
hour => 4,
44-
minute => 30,
45-
command => "${repack} ${repack_jobs} ${facts_tables} ${logging}",
45+
hour => 4,
46+
minute => 30,
47+
command => "${repack} ${repack_jobs} ${facts_tables} ${logging}",
4648
}
4749

4850
cron { 'pg_repack catalogs tables' :
49-
weekday => [0,4],
50-
hour => 4,
51-
minute => 30,
52-
command => "${repack} ${repack_jobs} ${catalogs_tables} ${logging}",
51+
weekday => [0,4],
52+
hour => 4,
53+
minute => 30,
54+
command => "${repack} ${repack_jobs} ${catalogs_tables} ${logging}",
5355
}
5456

5557
cron { 'pg_repack other tables' :

Diff for: manifests/maintenance/vacuum_full.pp

+11-11
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,23 @@
2929
}
3030

3131
Cron {
32-
ensure => $ensure_cron,
33-
user => 'root',
34-
require => File[$logging_directory, $script_directory],
32+
ensure => $ensure_cron,
33+
user => 'root',
34+
require => File[$logging_directory, $script_directory],
3535
}
3636

3737
cron { 'VACUUM FULL facts tables' :
38-
weekday => [2,6],
39-
hour => 4,
40-
minute => 30,
41-
command => "${vacuum_script_path} facts",
38+
weekday => [2,6],
39+
hour => 4,
40+
minute => 30,
41+
command => "${vacuum_script_path} facts",
4242
}
4343

4444
cron { 'VACUUM FULL catalogs tables' :
45-
weekday => [0,4],
46-
hour => 4,
47-
minute => 30,
48-
command => "${vacuum_script_path} catalogs",
45+
weekday => [0,4],
46+
hour => 4,
47+
minute => 30,
48+
command => "${vacuum_script_path} catalogs",
4949
}
5050

5151
cron { 'VACUUM FULL other tables' :

Diff for: manifests/postgresql_settings/table_settings.pp

+3-6
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@
44

55
class pe_databases::postgresql_settings::table_settings (
66
# lint:ignore:140chars
7-
Boolean $manage_reports_autovacuum_cost_delay = lookup('pe_databases::postgresql_settings::manage_reports_autovacuum_cost_delay',
8-
{'default_value' => true}),
9-
Optional[Float[0,1]] $factsets_autovacuum_vacuum_scale_factor = lookup('pe_databases::postgresql_settings::factsets_autovacuum_vacuum_scale_factor',
10-
{'default_value' => 0.80}),
11-
Optional[Float[0,1]] $reports_autovacuum_vacuum_scale_factor = lookup('pe_databases::postgresql_settings::reports_autovacuum_vacuum_scale_factor',
12-
{'default_value' => 0.01}),
7+
Boolean $manage_reports_autovacuum_cost_delay = lookup('pe_databases::postgresql_settings::manage_reports_autovacuum_cost_delay', {'default_value' => true}),
8+
Optional[Float[0,1]] $factsets_autovacuum_vacuum_scale_factor = lookup('pe_databases::postgresql_settings::factsets_autovacuum_vacuum_scale_factor', {'default_value' => 0.80}),
9+
Optional[Float[0,1]] $reports_autovacuum_vacuum_scale_factor = lookup('pe_databases::postgresql_settings::reports_autovacuum_vacuum_scale_factor', {'default_value' => 0.01}),
1310
Optional[Float[0,1]] $catalogs_autovacuum_vacuum_scale_factor = 0.75,
1411
Optional[Float[0,1]] $certnames_autovacuum_vacuum_scale_factor = 0.75,
1512
# lint:endignore

0 commit comments

Comments
 (0)