Skip to content

Commit 0418970

Browse files
authored
Merge pull request #1483 from bastelfreak/create
postgresql::server: Remove deprecated createdb_path parameter
2 parents ebd1c56 + 1627e74 commit 0418970

File tree

4 files changed

+0
-30
lines changed

4 files changed

+0
-30
lines changed

REFERENCE.md

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ The following parameters are available in the `postgresql::globals` class:
181181
* [`default_database`](#-postgresql--globals--default_database)
182182
* [`validcon_script_path`](#-postgresql--globals--validcon_script_path)
183183
* [`initdb_path`](#-postgresql--globals--initdb_path)
184-
* [`createdb_path`](#-postgresql--globals--createdb_path)
185184
* [`psql_path`](#-postgresql--globals--psql_path)
186185
* [`pg_hba_conf_path`](#-postgresql--globals--pg_hba_conf_path)
187186
* [`pg_ident_conf_path`](#-postgresql--globals--pg_ident_conf_path)
@@ -356,14 +355,6 @@ Path to the initdb command.
356355

357356
Default value: `undef`
358357

359-
##### <a name="-postgresql--globals--createdb_path"></a>`createdb_path`
360-
361-
Data type: `Optional[Variant[String[1], Stdlib::Absolutepath]]`
362-
363-
Deprecated. Path to the createdb command.
364-
365-
Default value: `undef`
366-
367358
##### <a name="-postgresql--globals--psql_path"></a>`psql_path`
368359

369360
Data type: `Optional[Variant[String[1], Stdlib::Absolutepath]]`
@@ -856,7 +847,6 @@ The following parameters are available in the `postgresql::server` class:
856847
* [`ipv4acls`](#-postgresql--server--ipv4acls)
857848
* [`ipv6acls`](#-postgresql--server--ipv6acls)
858849
* [`initdb_path`](#-postgresql--server--initdb_path)
859-
* [`createdb_path`](#-postgresql--server--createdb_path)
860850
* [`psql_path`](#-postgresql--server--psql_path)
861851
* [`pg_hba_conf_path`](#-postgresql--server--pg_hba_conf_path)
862852
* [`pg_ident_conf_path`](#-postgresql--server--pg_ident_conf_path)
@@ -1085,14 +1075,6 @@ Specifies the path to the initdb command.
10851075

10861076
Default value: `$postgresql::params::initdb_path`
10871077

1088-
##### <a name="-postgresql--server--createdb_path"></a>`createdb_path`
1089-
1090-
Data type: `Optional[Variant[String[1], Stdlib::Absolutepath]]`
1091-
1092-
Deprecated. Specifies the path to the createdb command.
1093-
1094-
Default value: `$postgresql::params::createdb_path`
1095-
10961078
##### <a name="-postgresql--server--psql_path"></a>`psql_path`
10971079

10981080
Data type: `Variant[String[1], Stdlib::Absolutepath]`

manifests/globals.pp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
# @param validcon_script_path Scipt path for the connection validation check.
2727
#
2828
# @param initdb_path Path to the initdb command.
29-
# @param createdb_path Deprecated. Path to the createdb command.
3029
# @param psql_path Sets the path to the psql command.
3130
# @param pg_hba_conf_path Specifies the path to your pg_hba.conf file.
3231
# @param pg_ident_conf_path Specifies the path to your pg_ident.conf file.
@@ -124,7 +123,6 @@
124123
Optional[String[1]] $validcon_script_path = undef,
125124

126125
Optional[Variant[String[1], Stdlib::Absolutepath]] $initdb_path = undef,
127-
Optional[Variant[String[1], Stdlib::Absolutepath]] $createdb_path = undef,
128126
Optional[Variant[String[1], Stdlib::Absolutepath]] $psql_path = undef,
129127
Optional[Variant[String[1], Stdlib::Absolutepath]] $pg_hba_conf_path = undef,
130128
Optional[Variant[String[1], Stdlib::Absolutepath]] $pg_ident_conf_path = undef,

manifests/server.pp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
# @param ipv6acls Lists strings for access control for connection method, users, databases, IPv6 addresses.
4747
#
4848
# @param initdb_path Specifies the path to the initdb command.
49-
# @param createdb_path Deprecated. Specifies the path to the createdb command.
5049
# @param psql_path Specifies the path to the psql command.
5150
# @param pg_hba_conf_path Specifies the path to your pg_hba.conf file.
5251
# @param pg_ident_conf_path Specifies the path to your pg_ident.conf file.
@@ -140,7 +139,6 @@
140139
Array[String[1]] $ipv6acls = $postgresql::params::ipv6acls,
141140

142141
Variant[String[1], Stdlib::Absolutepath] $initdb_path = $postgresql::params::initdb_path,
143-
Optional[Variant[String[1], Stdlib::Absolutepath]] $createdb_path = $postgresql::params::createdb_path,
144142
Variant[String[1], Stdlib::Absolutepath] $psql_path = $postgresql::params::psql_path,
145143
Variant[String[1], Stdlib::Absolutepath] $pg_hba_conf_path = $postgresql::params::pg_hba_conf_path,
146144
Variant[String[1], Stdlib::Absolutepath] $pg_ident_conf_path = $postgresql::params::pg_ident_conf_path,
@@ -192,9 +190,6 @@
192190
Enum['pg_dump'] $backup_provider = $postgresql::params::backup_provider,
193191
) inherits postgresql::params {
194192
$_version = $postgresql::params::version
195-
if $createdb_path != undef {
196-
warning('Passing "createdb_path" to postgresql::server is deprecated, it can be removed safely for the same behaviour')
197-
}
198193

199194
# Reload has its own ordering, specified by other defines
200195
class { 'postgresql::server::reload':

manifests/server/database.pp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
Boolean $istemplate = false,
2121
Hash $connect_settings = $postgresql::server::default_connect_settings,
2222
) {
23-
$createdb_path = $postgresql::server::createdb_path
2423
$user = $postgresql::server::user
2524
$group = $postgresql::server::group
2625
$psql_path = $postgresql::server::psql_path
@@ -79,10 +78,6 @@
7978
default => "TABLESPACE \"${tablespace}\"",
8079
}
8180

82-
if $createdb_path != undef {
83-
warning('Passing "createdb_path" to postgresql::database is deprecated, it can be removed safely for the same behaviour')
84-
}
85-
8681
postgresql_psql { "CREATE DATABASE \"${dbname}\"":
8782
command => "CREATE DATABASE \"${dbname}\" WITH ${template_option} ${encoding_option} ${locale_option} ${tablespace_option}",
8883
unless => "SELECT 1 FROM pg_database WHERE datname = '${dbname}'",

0 commit comments

Comments
 (0)