Skip to content

Commit c75719d

Browse files
authored
Merge pull request #1482 from bastelfreak/version
postgresql::server: Remove deprecated version parameter
2 parents 9ad64cd + 59f2d9a commit c75719d

File tree

2 files changed

+1
-20
lines changed

2 files changed

+1
-20
lines changed

REFERENCE.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,6 @@ The following parameters are available in the `postgresql::server` class:
891891
* [`backup_enable`](#-postgresql--server--backup_enable)
892892
* [`backup_options`](#-postgresql--server--backup_options)
893893
* [`backup_provider`](#-postgresql--server--backup_provider)
894-
* [`version`](#-postgresql--server--version)
895894
* [`extra_systemd_config`](#-postgresql--server--extra_systemd_config)
896895
* [`auth_host`](#-postgresql--server--auth_host)
897896
* [`auth_local`](#-postgresql--server--auth_local)
@@ -1374,14 +1373,6 @@ Specifies the backup provider to use.
13741373

13751374
Default value: `$postgresql::params::backup_provider`
13761375

1377-
##### <a name="-postgresql--server--version"></a>`version`
1378-
1379-
Data type: `Optional[String[1]]`
1380-
1381-
Deprecated. Use postgresql::globals instead. Sets PostgreSQL version
1382-
1383-
Default value: `undef`
1384-
13851376
##### <a name="-postgresql--server--extra_systemd_config"></a>`extra_systemd_config`
13861377

13871378
Data type: `Optional[String]`

manifests/server.pp

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@
106106
# @param backup_options A hash of options that should be passed through to the backup provider.
107107
# @param backup_provider Specifies the backup provider to use.
108108
#
109-
# @param version Deprecated. Use postgresql::globals instead. Sets PostgreSQL version
110-
#
111109
# @param extra_systemd_config
112110
# Adds extra config to systemd config file, can for instance be used to add extra openfiles. This can be a multi line string
113111
# @param auth_host auth method used by default for host authorization
@@ -192,19 +190,11 @@
192190
Boolean $backup_enable = $postgresql::params::backup_enable,
193191
Hash $backup_options = {},
194192
Enum['pg_dump'] $backup_provider = $postgresql::params::backup_provider,
195-
196-
#Deprecated
197-
Optional[String[1]] $version = undef,
198193
) inherits postgresql::params {
199194
if $port =~ String {
200195
deprecation('postgres_port', 'Passing a string to the port parameter is deprecated. Stdlib::Port will be the enforced datatype in the next major release')
201196
}
202-
if $version != undef {
203-
warning('Passing "version" to postgresql::server is deprecated; please use postgresql::globals instead.')
204-
$_version = $version
205-
} else {
206-
$_version = $postgresql::params::version
207-
}
197+
$_version = $postgresql::params::version
208198

209199
if $createdb_path != undef {
210200
warning('Passing "createdb_path" to postgresql::server is deprecated, it can be removed safely for the same behaviour')

0 commit comments

Comments
 (0)