Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Auto-select the default PostgreSQL version
  • Loading branch information
smortex committed Oct 8, 2023
commit ab1ebc656178bba01cfcca8a4e4c3d545ab772e5
2 changes: 1 addition & 1 deletion manifests/database/postgresql.pp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
if $manage_database {

# get the pg contrib to use pg_trgm extension
if (versioncmp($postgres_version, '10') < 0) {
if (versioncmp($postgresql::globals::globals_version, '10') < 0) {
include postgresql::server::contrib
}

Expand Down
6 changes: 1 addition & 5 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,7 @@
$manage_pg_repo = false
}

if $puppetdb_version in ['latest','present'] or versioncmp($puppetdb_version, '7.0.0') >= 0 {
$postgres_version = '11'
} else {
$postgres_version = '9.6'
}
$postgres_version = undef

# The remaining database settings are not used for an embedded database
$database_host = 'localhost'
Expand Down