From 59f2d9a009c2394e5338bd2d7ef5ccb87c94fdfe Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Wed, 30 Aug 2023 16:51:59 +0200 Subject: [PATCH] postgresql::server: Remove deprecated version parameter --- REFERENCE.md | 9 --------- manifests/server.pp | 12 +----------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/REFERENCE.md b/REFERENCE.md index a19903bff8..03e2f0f36d 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -891,7 +891,6 @@ The following parameters are available in the `postgresql::server` class: * [`backup_enable`](#-postgresql--server--backup_enable) * [`backup_options`](#-postgresql--server--backup_options) * [`backup_provider`](#-postgresql--server--backup_provider) -* [`version`](#-postgresql--server--version) * [`extra_systemd_config`](#-postgresql--server--extra_systemd_config) * [`auth_host`](#-postgresql--server--auth_host) * [`auth_local`](#-postgresql--server--auth_local) @@ -1374,14 +1373,6 @@ Specifies the backup provider to use. Default value: `$postgresql::params::backup_provider` -##### `version` - -Data type: `Optional[String[1]]` - -Deprecated. Use postgresql::globals instead. Sets PostgreSQL version - -Default value: `undef` - ##### `extra_systemd_config` Data type: `Optional[String]` diff --git a/manifests/server.pp b/manifests/server.pp index 1971adfa24..c226217310 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -106,8 +106,6 @@ # @param backup_options A hash of options that should be passed through to the backup provider. # @param backup_provider Specifies the backup provider to use. # -# @param version Deprecated. Use postgresql::globals instead. Sets PostgreSQL version -# # @param extra_systemd_config # Adds extra config to systemd config file, can for instance be used to add extra openfiles. This can be a multi line string # @param auth_host auth method used by default for host authorization @@ -192,19 +190,11 @@ Boolean $backup_enable = $postgresql::params::backup_enable, Hash $backup_options = {}, Enum['pg_dump'] $backup_provider = $postgresql::params::backup_provider, - - #Deprecated - Optional[String[1]] $version = undef, ) inherits postgresql::params { if $port =~ String { deprecation('postgres_port', 'Passing a string to the port parameter is deprecated. Stdlib::Port will be the enforced datatype in the next major release') } - if $version != undef { - warning('Passing "version" to postgresql::server is deprecated; please use postgresql::globals instead.') - $_version = $version - } else { - $_version = $postgresql::params::version - } + $_version = $postgresql::params::version if $createdb_path != undef { warning('Passing "createdb_path" to postgresql::server is deprecated, it can be removed safely for the same behaviour')