Skip to content

Commit c401e74

Browse files
smortexsmortex
committed
Drop legacy maxconcurjobs storage parameter
This parameter has been replaced by a max_concurrent_jobs for consistency with other classes.
1 parent 687ed1c commit c401e74

File tree

4 files changed

+3
-48
lines changed

4 files changed

+3
-48
lines changed

‎REFERENCE.md‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,6 @@ The following parameters are available in the `bacula::storage` class:
790790
* [`group`](#-bacula--storage--group)
791791
* [`homedir`](#-bacula--storage--homedir)
792792
* [`listen_address`](#-bacula--storage--listen_address)
793-
* [`maxconcurjobs`](#-bacula--storage--maxconcurjobs)
794793
* [`max_concurrent_jobs`](#-bacula--storage--max_concurrent_jobs)
795794
* [`media_type`](#-bacula--storage--media_type)
796795
* [`password`](#-bacula--storage--password)
@@ -909,14 +908,6 @@ The notes for `bacula::client::listen_address` apply.
909908

910909
Default value: `[]`
911910

912-
##### <a name="-bacula--storage--maxconcurjobs"></a>`maxconcurjobs`
913-
914-
Data type: `Optional[Integer[1]]`
915-
916-
DEPRECATED maximum number of Jobs that may run concurrently
917-
918-
Default value: `undef`
919-
920911
##### <a name="-bacula--storage--max_concurrent_jobs"></a>`max_concurrent_jobs`
921912

922913
Data type: `Integer[1]`
@@ -1333,7 +1324,6 @@ The following parameters are available in the `bacula::director::storage` define
13331324
* [`password`](#-bacula--director--storage--password)
13341325
* [`device_name`](#-bacula--director--storage--device_name)
13351326
* [`media_type`](#-bacula--director--storage--media_type)
1336-
* [`maxconcurjobs`](#-bacula--director--storage--maxconcurjobs)
13371327
* [`max_concurrent_jobs`](#-bacula--director--storage--max_concurrent_jobs)
13381328
* [`conf_dir`](#-bacula--director--storage--conf_dir)
13391329

@@ -1377,14 +1367,6 @@ Bacula director configuration for Storage option 'Media Type'
13771367

13781368
Default value: `'File'`
13791369

1380-
##### <a name="-bacula--director--storage--maxconcurjobs"></a>`maxconcurjobs`
1381-
1382-
Data type: `Optional[Integer[1]]`
1383-
1384-
DEPRECATED Bacula director configuration for Storage option 'Maximum Concurrent Jobs'
1385-
1386-
Default value: `undef`
1387-
13881370
##### <a name="-bacula--director--storage--max_concurrent_jobs"></a>`max_concurrent_jobs`
13891371

13901372
Data type: `Integer[1]`
@@ -2016,7 +1998,6 @@ The following parameters are available in the `bacula::storage::device` defined
20161998
* [`automatic_mount`](#-bacula--storage--device--automatic_mount)
20171999
* [`removable_media`](#-bacula--storage--device--removable_media)
20182000
* [`always_open`](#-bacula--storage--device--always_open)
2019-
* [`maxconcurjobs`](#-bacula--storage--device--maxconcurjobs)
20202001
* [`max_concurrent_jobs`](#-bacula--storage--device--max_concurrent_jobs)
20212002
* [`conf_dir`](#-bacula--storage--device--conf_dir)
20222003
* [`device_mode`](#-bacula--storage--device--device_mode)
@@ -2089,14 +2070,6 @@ Bacula director configuration for Device option 'AlwaysOpen'
20892070

20902071
Default value: `false`
20912072

2092-
##### <a name="-bacula--storage--device--maxconcurjobs"></a>`maxconcurjobs`
2093-
2094-
Data type: `Optional[Integer[1]]`
2095-
2096-
DEPRECATED Bacula director configuration for Device option 'Maximum Concurrent Jobs'
2097-
2098-
Default value: `undef`
2099-
21002073
##### <a name="-bacula--storage--device--max_concurrent_jobs"></a>`max_concurrent_jobs`
21012074

21022075
Data type: `Integer[1]`

‎manifests/director/storage.pp‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# @param password Bacula director configuration for Storage option 'Password'
1313
# @param device_name Bacula director configuration for Storage option 'Device'
1414
# @param media_type Bacula director configuration for Storage option 'Media Type'
15-
# @param maxconcurjobs DEPRECATED Bacula director configuration for Storage option 'Maximum Concurrent Jobs'
1615
# @param max_concurrent_jobs Bacula director configuration for Storage option 'Maximum Concurrent Jobs'
1716
# @param conf_dir Bacula configuration directory
1817
#
@@ -22,22 +21,17 @@
2221
Bacula::Password $password = 'secret',
2322
String[1] $device_name = "${facts['networking']['fqdn']}-device",
2423
String[1] $media_type = 'File',
25-
Optional[Integer[1]] $maxconcurjobs = undef,
2624
Integer[1] $max_concurrent_jobs = 1,
2725
Stdlib::Absolutepath $conf_dir = $bacula::conf_dir,
2826
) {
29-
if $maxconcurjobs {
30-
deprecation('bacula::director::maxconcurjobs', 'This parameter is deprecated. Use bacula::director::max_concurrent_jobs instead.')
31-
}
32-
3327
$epp_storage_variables = {
3428
name => $name,
3529
address => $address,
3630
port => $port,
3731
password => $password,
3832
device_name => $device_name,
3933
media_type => $media_type,
40-
max_concurrent_jobs => pick($maxconcurjobs, $max_concurrent_jobs),
34+
max_concurrent_jobs => $max_concurrent_jobs,
4135
}
4236

4337
concat::fragment { "bacula-director-storage-${name}":

‎manifests/storage.pp‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
# @param homedir The directory in which the Storage daemon may put its status files
1818
# @param listen_address The listening IP addresses for the storage daemon
1919
# The notes for `bacula::client::listen_address` apply.
20-
# @param maxconcurjobs DEPRECATED maximum number of Jobs that may run concurrently
2120
# @param max_concurrent_jobs The maximum number of Jobs that may run concurrently
2221
# @param media_type The type of media supported by this device
2322
# @param password Specifies the password that must be supplied by the named Director
@@ -42,7 +41,6 @@
4241
String[1] $group = $bacula::bacula_group,
4342
Stdlib::Absolutepath $homedir = $bacula::homedir,
4443
Array[String[1]] $listen_address = [],
45-
Optional[Integer[1]] $maxconcurjobs = undef,
4644
Integer[1] $max_concurrent_jobs = 20,
4745
String[1] $media_type = 'File',
4846
Bacula::Password $password = 'secret',
@@ -52,10 +50,6 @@
5250
String[1] $address = $facts['networking']['fqdn'],
5351
String[1] $user = $bacula::bacula_user,
5452
) inherits bacula {
55-
if $maxconcurjobs {
56-
deprecation('bacula::storage::maxconcurjobs', 'This parameter is deprecated. Use bacula::storage::device_max_concurrent_jobs instead.')
57-
}
58-
5953
# Allow for package names to include EPP syntax for db_type
6054
$package_names = $packages.map |$p| {
6155
$package_name = inline_epp($p,
@@ -80,7 +74,7 @@
8074

8175
bacula::storage::device { $device_name:
8276
device => $device,
83-
max_concurrent_jobs => pick($maxconcurjobs, $device_max_concurrent_jobs),
77+
max_concurrent_jobs => $device_max_concurrent_jobs,
8478
}
8579

8680
concat::fragment { 'bacula-storage-dir':

‎manifests/storage/device.pp‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
# @param automatic_mount Bacula director configuration for Device option 'AutomaticMount'
1212
# @param removable_media Bacula director configuration for Device option 'RemovableMedia'
1313
# @param always_open Bacula director configuration for Device option 'AlwaysOpen'
14-
# @param maxconcurjobs DEPRECATED Bacula director configuration for Device option 'Maximum Concurrent Jobs'
1514
# @param max_concurrent_jobs Bacula director configuration for Device option 'Maximum Concurrent Jobs'
1615
# @param conf_dir Path to bacula configuration directory
1716
# @param device_mode Unix mode of the Archive Device directory
@@ -29,7 +28,6 @@
2928
Bacula::Yesno $automatic_mount = true,
3029
Bacula::Yesno $removable_media = false,
3130
Bacula::Yesno $always_open = false,
32-
Optional[Integer[1]] $maxconcurjobs = undef,
3331
Integer[1] $max_concurrent_jobs = 1,
3432
Stdlib::Absolutepath $conf_dir = $bacula::conf_dir,
3533
Stdlib::Filemode $device_mode = '0770',
@@ -38,10 +36,6 @@
3836
String[1] $director_name = $bacula::director_name,
3937
String[1] $group = $bacula::bacula_group,
4038
) {
41-
if $maxconcurjobs {
42-
deprecation('bacula::storage::device::maxconcurjobs', 'This parameter is deprecated. Use bacula::storage::device::max_concurrent_jobs instead.')
43-
}
44-
4539
$epp_device_variables = {
4640
device_name => $device_name,
4741
media_type => $media_type,
@@ -51,7 +45,7 @@
5145
automatic_mount => $automatic_mount,
5246
removable_media => $removable_media,
5347
always_open => $always_open,
54-
max_concurrent_jobs => pick($maxconcurjobs, $max_concurrent_jobs),
48+
max_concurrent_jobs => $max_concurrent_jobs,
5549
}
5650

5751
concat::fragment { "bacula-storage-device-${name}":

0 commit comments

Comments
 (0)