diff --git a/REFERENCE.md b/REFERENCE.md index bb51deb071..3b5f194fe9 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -181,7 +181,6 @@ The following parameters are available in the `postgresql::globals` class: * [`default_database`](#-postgresql--globals--default_database) * [`validcon_script_path`](#-postgresql--globals--validcon_script_path) * [`initdb_path`](#-postgresql--globals--initdb_path) -* [`createdb_path`](#-postgresql--globals--createdb_path) * [`psql_path`](#-postgresql--globals--psql_path) * [`pg_hba_conf_path`](#-postgresql--globals--pg_hba_conf_path) * [`pg_ident_conf_path`](#-postgresql--globals--pg_ident_conf_path) @@ -356,14 +355,6 @@ Path to the initdb command. Default value: `undef` -##### `createdb_path` - -Data type: `Optional[Variant[String[1], Stdlib::Absolutepath]]` - -Deprecated. Path to the createdb command. - -Default value: `undef` - ##### `psql_path` Data type: `Optional[Variant[String[1], Stdlib::Absolutepath]]` @@ -856,7 +847,6 @@ The following parameters are available in the `postgresql::server` class: * [`ipv4acls`](#-postgresql--server--ipv4acls) * [`ipv6acls`](#-postgresql--server--ipv6acls) * [`initdb_path`](#-postgresql--server--initdb_path) -* [`createdb_path`](#-postgresql--server--createdb_path) * [`psql_path`](#-postgresql--server--psql_path) * [`pg_hba_conf_path`](#-postgresql--server--pg_hba_conf_path) * [`pg_ident_conf_path`](#-postgresql--server--pg_ident_conf_path) @@ -1085,14 +1075,6 @@ Specifies the path to the initdb command. Default value: `$postgresql::params::initdb_path` -##### `createdb_path` - -Data type: `Optional[Variant[String[1], Stdlib::Absolutepath]]` - -Deprecated. Specifies the path to the createdb command. - -Default value: `$postgresql::params::createdb_path` - ##### `psql_path` Data type: `Variant[String[1], Stdlib::Absolutepath]` diff --git a/manifests/globals.pp b/manifests/globals.pp index c9243cd41c..d04dda7e47 100644 --- a/manifests/globals.pp +++ b/manifests/globals.pp @@ -26,7 +26,6 @@ # @param validcon_script_path Scipt path for the connection validation check. # # @param initdb_path Path to the initdb command. -# @param createdb_path Deprecated. Path to the createdb command. # @param psql_path Sets the path to the psql command. # @param pg_hba_conf_path Specifies the path to your pg_hba.conf file. # @param pg_ident_conf_path Specifies the path to your pg_ident.conf file. @@ -124,7 +123,6 @@ Optional[String[1]] $validcon_script_path = undef, Optional[Variant[String[1], Stdlib::Absolutepath]] $initdb_path = undef, - Optional[Variant[String[1], Stdlib::Absolutepath]] $createdb_path = undef, Optional[Variant[String[1], Stdlib::Absolutepath]] $psql_path = undef, Optional[Variant[String[1], Stdlib::Absolutepath]] $pg_hba_conf_path = undef, Optional[Variant[String[1], Stdlib::Absolutepath]] $pg_ident_conf_path = undef, diff --git a/manifests/server.pp b/manifests/server.pp index 25c607bb48..99285b458c 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -46,7 +46,6 @@ # @param ipv6acls Lists strings for access control for connection method, users, databases, IPv6 addresses. # # @param initdb_path Specifies the path to the initdb command. -# @param createdb_path Deprecated. Specifies the path to the createdb command. # @param psql_path Specifies the path to the psql command. # @param pg_hba_conf_path Specifies the path to your pg_hba.conf file. # @param pg_ident_conf_path Specifies the path to your pg_ident.conf file. @@ -140,7 +139,6 @@ Array[String[1]] $ipv6acls = $postgresql::params::ipv6acls, Variant[String[1], Stdlib::Absolutepath] $initdb_path = $postgresql::params::initdb_path, - Optional[Variant[String[1], Stdlib::Absolutepath]] $createdb_path = $postgresql::params::createdb_path, Variant[String[1], Stdlib::Absolutepath] $psql_path = $postgresql::params::psql_path, Variant[String[1], Stdlib::Absolutepath] $pg_hba_conf_path = $postgresql::params::pg_hba_conf_path, Variant[String[1], Stdlib::Absolutepath] $pg_ident_conf_path = $postgresql::params::pg_ident_conf_path, @@ -192,9 +190,6 @@ Enum['pg_dump'] $backup_provider = $postgresql::params::backup_provider, ) inherits postgresql::params { $_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') - } # Reload has its own ordering, specified by other defines class { 'postgresql::server::reload': diff --git a/manifests/server/database.pp b/manifests/server/database.pp index bfc7d53247..27e49e2eab 100644 --- a/manifests/server/database.pp +++ b/manifests/server/database.pp @@ -20,7 +20,6 @@ Boolean $istemplate = false, Hash $connect_settings = $postgresql::server::default_connect_settings, ) { - $createdb_path = $postgresql::server::createdb_path $user = $postgresql::server::user $group = $postgresql::server::group $psql_path = $postgresql::server::psql_path @@ -79,10 +78,6 @@ default => "TABLESPACE \"${tablespace}\"", } - if $createdb_path != undef { - warning('Passing "createdb_path" to postgresql::database is deprecated, it can be removed safely for the same behaviour') - } - postgresql_psql { "CREATE DATABASE \"${dbname}\"": command => "CREATE DATABASE \"${dbname}\" WITH ${template_option} ${encoding_option} ${locale_option} ${tablespace_option}", unless => "SELECT 1 FROM pg_database WHERE datname = '${dbname}'",