Skip to content

Commit b62b085

Browse files
committed
(maint) remove extra dollar and denote issue with psql_version
$postgresql_version and $pe_databases::psql_version are redundant. But $pe_databases::psql_version cast is to ${psql_version}00000 in spec tests.
1 parent f35b88c commit b62b085

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

manifests/maintenance/pg_repack.pp

+4-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515

1616
# PE 2019.1 starting shipping versioned pe-postgres packages where all paths are versioned.
1717
# So, prior to 2019.1 use a non-versioned path, and after use a versioned path.
18-
18+
# TODO: Use $pe_databases::psql_version after identifying why it is cast to ${psql_version}00000 in spec tests.
1919
$postgresql_version = $facts['pe_postgresql_info']['installed_server_version']
2020
$repack_executable = versioncmp('2019.1.0', $facts['pe_server_version']) ? {
2121
1 => '/opt/puppetlabs/server/apps/postgresql/bin/pg_repack',
22-
default => "/opt/puppetlabs/server/apps/postgresql/${$postgresql_version}/bin/pg_repack"
22+
default => "/opt/puppetlabs/server/apps/postgresql/${postgresql_version}/bin/pg_repack"
2323
}
2424

2525
$repack = "su - pe-postgres -s /bin/bash -c \"${repack_executable} -d pe-puppetdb"
@@ -28,10 +28,12 @@
2828
$facts_tables = '-t factsets -t fact_paths"'
2929
$catalogs_tables = '-t catalogs -t catalog_resources -t edges -t certnames"'
3030
$other_tables = '-t producers -t resource_params -t resource_params_cache"'
31+
3132
$reports_tables = versioncmp('2019.1.0', $facts['pe_server_version']) ? {
3233
1 => '-t reports"',
3334
default => '-t reports -t resource_events"'
3435
}
36+
3537
$logging = "> ${logging_directory}/output.log 2>&1"
3638

3739
Cron {

0 commit comments

Comments
 (0)