Skip to content

Commit c8376a3

Browse files
MartyEwingsMartyEwings
authored
Merge pull request #108 from SimonHoenscheid/shoenscheid_fix_puppet_lint_warnings
fix puppet lint warnings
2 parents 14ae7e4 + e30cd20 commit c8376a3

File tree

7 files changed

+27
-35
lines changed

7 files changed

+27
-35
lines changed

‎manifests/collect.pp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
Boolean $disable_maintenance = false,
1111
String $on_cal = undef,
1212
) {
13-
1413
Service {
1514
notify => Exec['pe_databases_daemon_reload'],
1615
}
@@ -28,11 +27,11 @@
2827
default => present
2928
}
3029

31-
file {"/etc/systemd/system/pe_databases-${database_type}.service":
30+
file { "/etc/systemd/system/pe_databases-${database_type}.service":
3231
ensure => $ensure_file,
3332
content => epp('pe_databases/service.epp', { 'tables' => $database_type, 'command' => $command }),
3433
}
35-
file {"/etc/systemd/system/pe_databases-${database_type}.timer":
34+
file { "/etc/systemd/system/pe_databases-${database_type}.timer":
3635
ensure => $ensure_file,
3736
content => epp('pe_databases/timer.epp', { 'tables' => $database_type, 'on_cal' => $on_cal }),
3837
}

‎manifests/init.pp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# @summary Tuning, maintenance for PE PostgreSQL.
22
#
3+
# @param manage_database_maintenance [Boolean] true or false (Default: true)
4+
# Manage the inclusion of the pg_repack class
35
# @param disable_maintenance [Boolean] true or false (Default: false)
46
# Disable or enable maintenance mode
57
# @param manage_postgresql_settings [Boolean] true or false (Default: true)
@@ -9,22 +11,19 @@
911
# @param install_dir [String] Directory to install module into (Default: "/opt/puppetlabs/pe_databases")
1012
# @param scripts_dir [String] Directory to install scripts into (Default: "${install_dir}/scripts")
1113
class pe_databases (
12-
# Manage the inclusion of the pg_repack class
1314
Boolean $manage_database_maintenance = true,
14-
# Manage the state of the maintenance tasks, i.e. systemd services and timers
15-
Boolean $disable_maintenance = lookup('pe_databases::disable_maintenance', {'default_value' => false}),
15+
Boolean $disable_maintenance = false,
1616
Boolean $manage_postgresql_settings = true,
1717
Boolean $manage_table_settings = false,
1818
String $install_dir = '/opt/puppetlabs/pe_databases',
1919
String $scripts_dir = "${install_dir}/scripts"
2020
) {
21-
2221
$psql_version = $facts['pe_postgresql_info']['installed_server_version'] ? {
2322
undef => undef,
2423
default => String($facts['pe_postgresql_info']['installed_server_version'])
2524
}
2625

27-
file { [$install_dir, $scripts_dir] :
26+
file { [$install_dir, $scripts_dir]:
2827
ensure => directory,
2928
mode => '0755',
3029
}
@@ -38,7 +37,7 @@
3837
if $facts.dig('pe_databases', 'have_systemd') {
3938
if versioncmp('2019.0.2', $facts['pe_server_version']) <= 0 {
4039
if $manage_database_maintenance {
41-
class {'pe_databases::pg_repack':
40+
class { 'pe_databases::pg_repack':
4241
disable_maintenance => $disable_maintenance,
4342
}
4443
if $manage_table_settings {
@@ -48,7 +47,6 @@
4847
include pe_databases::postgresql_settings::table_settings
4948
}
5049
}
51-
5250
}
5351
else {
5452
notify { 'pe_databases_version_warn':

‎manifests/pg_repack.pp

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,55 +10,54 @@
1010
Boolean $disable_maintenance = false,
1111
Integer $jobs = $facts['processors']['count'] / 4
1212
) {
13-
1413
# PE 2019.1 starting shipping versioned pe-postgres packages where all paths are versioned.
1514
# So, prior to 2019.1 use a non-versioned path, and after use a versioned path.
1615
# TODO: Use $pe_databases::psql_version after identifying why it is cast to ${psql_version}00000 in spec tests.
1716
$postgresql_version = $facts['pe_postgresql_info']['installed_server_version']
1817
$repack_executable = versioncmp('2019.1.0', $facts['pe_server_version']) ? {
19-
1 => '/opt/puppetlabs/server/apps/postgresql/bin/pg_repack',
20-
default => "/opt/puppetlabs/server/apps/postgresql/${postgresql_version}/bin/pg_repack"
21-
}
18+
1 => '/opt/puppetlabs/server/apps/postgresql/bin/pg_repack',
19+
default => "/opt/puppetlabs/server/apps/postgresql/${postgresql_version}/bin/pg_repack"
20+
}
2221

2322
$repack = "${repack_executable} -d pe-puppetdb"
2423
$repack_jobs = "--jobs ${jobs}"
2524

2625
$facts_tables = '-t factsets -t fact_paths'
2726
$catalogs_tables = versioncmp($facts['pe_server_version'], '2019.8.1') ? {
28-
1 => '-t catalogs -t catalog_resources -t catalog_inputs -t edges -t certnames',
29-
default => '-t catalogs -t catalog_resources -t edges -t certnames' }
27+
1 => '-t catalogs -t catalog_resources -t catalog_inputs -t edges -t certnames',
28+
default => '-t catalogs -t catalog_resources -t edges -t certnames' }
3029
$other_tables = '-t producers -t resource_params -t resource_params_cache'
3130
$reports_table = '-t reports'
3231
$resource_events_table = '-t resource_events'
3332

34-
pe_databases::collect {'facts':
33+
pe_databases::collect { 'facts':
3534
disable_maintenance => $disable_maintenance,
3635
command => "${repack} ${repack_jobs} ${facts_tables}",
3736
on_cal => 'Tue,Sat *-*-* 04:30:00',
3837
}
3938

40-
pe_databases::collect {'catalogs':
39+
pe_databases::collect { 'catalogs':
4140
disable_maintenance => $disable_maintenance,
4241
command => "${repack} ${repack_jobs} ${catalogs_tables}",
4342
on_cal => 'Sun,Thu *-*-* 04:30:00',
4443
}
4544

46-
pe_databases::collect {'other':
45+
pe_databases::collect { 'other':
4746
disable_maintenance => $disable_maintenance,
4847
command => "${repack} ${repack_jobs} ${other_tables}",
4948
on_cal => '*-*-20 05:30:00',
5049
}
5150

5251
if versioncmp($facts['pe_server_version'], '2019.7.0') < 0 {
53-
pe_databases::collect {'reports':
52+
pe_databases::collect { 'reports':
5453
disable_maintenance => $disable_maintenance,
5554
command => "${repack} ${repack_jobs} ${reports_table}",
5655
on_cal => '*-*-10 05:30:00',
5756
}
5857
}
5958

6059
if versioncmp($facts['pe_server_version'], '2019.3.0') < 0 {
61-
pe_databases::collect {'resource_events':
60+
pe_databases::collect { 'resource_events':
6261
disable_maintenance => $disable_maintenance,
6362
command => "${repack} ${repack_jobs} ${resource_events_table}",
6463
on_cal => '*-*-15 05:30:00',
@@ -78,6 +77,6 @@
7877
'Maintain PE databases',
7978
]
8079
cron { $legacy_crons:
81-
ensure => absent,
80+
ensure => absent,
8281
}
8382
}

‎manifests/postgresql_settings.pp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,16 @@
2626
Optional[Float[0,1]] $factsets_autovacuum_vacuum_scale_factor = 0.80,
2727
Optional[Float[0,1]] $reports_autovacuum_vacuum_scale_factor = 0.01,
2828
String $maintenance_work_mem = $all_in_one_pe_install ? {
29-
false => "${facts['memory']['system']['total_bytes'] / 1024 / 1024 / 3}MB",
30-
true => "${facts['memory']['system']['total_bytes'] / 1024 / 1024 / 8}MB",
31-
},
29+
false => "${facts['memory']['system']['total_bytes'] / 1024 / 1024 / 3}MB",
30+
true => "${facts['memory']['system']['total_bytes'] / 1024 / 1024 / 8}MB",
31+
},
3232
String $autovacuum_work_mem = $all_in_one_pe_install ? {
33-
false => "${facts['memory']['system']['total_bytes'] / 1024 / 1024 / 3 / $autovacuum_max_workers}MB",
34-
true => "${facts['memory']['system']['total_bytes'] / 1024 / 1024 / 8 / $autovacuum_max_workers}MB",
35-
},
33+
false => "${facts['memory']['system']['total_bytes'] / 1024 / 1024 / 3 / $autovacuum_max_workers}MB",
34+
true => "${facts['memory']['system']['total_bytes'] / 1024 / 1024 / 8 / $autovacuum_max_workers}MB",
35+
},
3636
String $psql_version = $pe_databases::psql_version,
3737
# lint:endignore
3838
) {
39-
4039
$postgresql_service_resource_name = 'postgresqld'
4140
$postgresql_service_name = 'pe-postgresql'
4241
$notify_postgresql_service = $manage_postgresql_service ? {

‎manifests/postgresql_settings/table_settings.pp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
#
66
class pe_databases::postgresql_settings::table_settings (
77
# lint:ignore:140chars
8-
Boolean $manage_reports_autovacuum_cost_delay = lookup('pe_databases::postgresql_settings::manage_reports_autovacuum_cost_delay', {'default_value' => true}),
9-
Optional[Float[0,1]] $factsets_autovacuum_vacuum_scale_factor = lookup('pe_databases::postgresql_settings::factsets_autovacuum_vacuum_scale_factor', {'default_value' => 0.80}),
10-
Optional[Float[0,1]] $reports_autovacuum_vacuum_scale_factor = lookup('pe_databases::postgresql_settings::reports_autovacuum_vacuum_scale_factor', {'default_value' => 0.01}),
8+
Boolean $manage_reports_autovacuum_cost_delay = lookup('pe_databases::postgresql_settings::manage_reports_autovacuum_cost_delay', { 'default_value' => true }),
9+
Optional[Float[0,1]] $factsets_autovacuum_vacuum_scale_factor = lookup('pe_databases::postgresql_settings::factsets_autovacuum_vacuum_scale_factor', { 'default_value' => 0.80 }),
10+
Optional[Float[0,1]] $reports_autovacuum_vacuum_scale_factor = lookup('pe_databases::postgresql_settings::reports_autovacuum_vacuum_scale_factor', { 'default_value' => 0.01 }),
1111
Optional[Float[0,1]] $catalogs_autovacuum_vacuum_scale_factor = 0.75,
1212
Optional[Float[0,1]] $certnames_autovacuum_vacuum_scale_factor = 0.75,
1313
# lint:endignore
1414
) {
15-
1615
if $manage_reports_autovacuum_cost_delay {
1716
pe_databases::set_puppetdb_table_autovacuum_cost_delay_zero { 'reports' : }
1817
}

‎manifests/set_puppetdb_table_autovacuum_cost_delay_zero.pp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
define pe_databases::set_puppetdb_table_autovacuum_cost_delay_zero (
99
String $table_name = $title,
1010
) {
11-
1211
pe_databases::set_table_attribute { "Set autovacuum_cost_delay=0 for ${table_name}" :
1312
db => 'pe-puppetdb',
1413
table_name => $table_name,

‎manifests/set_table_attribute.pp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
String $table_attribute,
1919
String $table_attribute_value,
2020
) {
21-
2221
# lint:ignore:140chars
2322
pe_postgresql_psql { "Set ${table_attribute}=${table_attribute_value} for ${table_name}" :
2423
command => "ALTER TABLE ${table_name} SET ( ${table_attribute} = ${table_attribute_value} )",

0 commit comments

Comments
 (0)