Skip to content

Commit cfa5fdf

Browse files
committed
Remove legacy backwards-compatible data types
When data types where added in version 5.4.0 a few years ago (#117), backward compatibility with old catalog that used String for all parameters was preserved. We already did a few major releases so keeping this backward compatibility does not make sense and we can make the types more consistent by removing them.
1 parent bbd0bbe commit cfa5fdf

3 files changed

Lines changed: 23 additions & 23 deletions

File tree

REFERENCE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,7 @@ The address of the Bacula File server daemon
10261026

10271027
##### <a name="-bacula--director--client--port"></a>`port`
10281028

1029-
Data type: `Variant[String[1],Stdlib::Port]`
1029+
Data type: `Stdlib::Port`
10301030

10311031
The port of the Bacula File server daemon
10321032

@@ -1344,7 +1344,7 @@ Default value: `undef`
13441344

13451345
##### <a name="-bacula--director--pool--maxvoljobs"></a>`maxvoljobs`
13461346

1347-
Data type: `Optional[Variant[String[1],Integer[1]]]`
1347+
Data type: `Optional[Integer[1]]`
13481348

13491349
Bacula pool configuration option "Maximum Volume Jobs"
13501350

@@ -1360,7 +1360,7 @@ Default value: `undef`
13601360

13611361
##### <a name="-bacula--director--pool--maxvols"></a>`maxvols`
13621362

1363-
Data type: `Optional[Variant[String[1],Integer[1]]]`
1363+
Data type: `Optional[Integer[1]]`
13641364

13651365
Bacula pool configuration option "Maximum Volumes"
13661366

manifests/director/client.pp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
# }
2424
#
2525
define bacula::director::client (
26-
String[1] $address,
27-
Variant[String[1],Stdlib::Port] $port, # FIXME: Remove String
28-
Bacula::Password $password,
29-
Bacula::Time $file_retention,
30-
Bacula::Time $job_retention,
31-
Bacula::Yesno $autoprune,
32-
Stdlib::Absolutepath $conf_dir = $bacula::conf_dir,
26+
String[1] $address,
27+
Stdlib::Port $port,
28+
Bacula::Password $password,
29+
Bacula::Time $file_retention,
30+
Bacula::Time $job_retention,
31+
Bacula::Yesno $autoprune,
32+
Stdlib::Absolutepath $conf_dir = $bacula::conf_dir,
3333
) {
3434
$epp_client_variables = {
3535
name => $name,

manifests/director/pool.pp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@
2929
# }
3030
#
3131
define bacula::director::pool (
32-
Optional[Bacula::Time] $volret = undef,
33-
Optional[Variant[String[1],Integer[1]]] $maxvoljobs = undef, # FIXME: Remove String
34-
Optional[Bacula::Size] $maxvolbytes = undef,
35-
Optional[Variant[String[1],Integer[1]]] $maxvols = undef, # FIXME: Remove String
36-
Optional[String[1]] $label = undef,
37-
Optional[Bacula::Time] $voluseduration = undef,
38-
String[1] $storage = $bacula::director::storage,
39-
String[1] $pooltype = 'Backup',
40-
Bacula::Yesno $recycle = true,
41-
Bacula::Yesno $autoprune = true,
42-
String[1] $purgeaction = 'Truncate',
43-
Optional[String[1]] $next_pool = undef,
44-
Stdlib::Absolutepath $conf_dir = $bacula::conf_dir,
32+
Optional[Bacula::Time] $volret = undef,
33+
Optional[Integer[1]] $maxvoljobs = undef,
34+
Optional[Bacula::Size] $maxvolbytes = undef,
35+
Optional[Integer[1]] $maxvols = undef,
36+
Optional[String[1]] $label = undef,
37+
Optional[Bacula::Time] $voluseduration = undef,
38+
String[1] $storage = $bacula::director::storage,
39+
String[1] $pooltype = 'Backup',
40+
Bacula::Yesno $recycle = true,
41+
Bacula::Yesno $autoprune = true,
42+
String[1] $purgeaction = 'Truncate',
43+
Optional[String[1]] $next_pool = undef,
44+
Stdlib::Absolutepath $conf_dir = $bacula::conf_dir,
4545
) {
4646
$epp_pool_variables = {
4747
name => $name,

0 commit comments

Comments
 (0)