Merge pull request #36 from mila-iqia/FixIssue/35

Allow max concurrent jobs definition

Author: btravouillon

README.md

@@ -13,8 +13,10 @@ __Note:__ More options can be seen in `defaults/main.yml`
 - `bareos_sensu_postgres_pass` - Set pass for user sensu to postgresql
 - `bareos_email` - Email address used for messages (Daemon, Standard) and Catalog bootstrap
 - `bareos_dir_ip_eth` - Director ethernet IP address
+- `bareos_dir_max_concurrent_jobs` - [Optional] Director-level maximum concurrent jobs, defaults to 50
 - `bareos_director` - If you need to override backup director IP address on your client's /etc/hosts
 - `bareos_repo` - Defaults to Bareos Community Repository. Can be changed to use the Bareos Subscription Repository
+- `bareos_sd_max_concurrent_jobs` - [Optional] SD-level maximum concurrent jobs, defaults to 50
 ```
 bareos_director:
   ip: 10.0.0.1
@@ -34,6 +36,7 @@ bareos_clients:
     director_ip: 10.0.0.1               # optional
     director_name: backup               # optional
     max_job_bandwidth: 1 mb/s           # optional
+    max_concurrent_jobs: 42             # optional, defaults to '20'
 ```
 
 - `bareos_filesets`: List of filesets in following format:
@@ -141,6 +144,7 @@ bareos_jobdefs:
     full_pool: FullFoo
     incr_pool: IncrementalFoo
     type: JOB_TYPE                      # optional, defaults to 'Backup'
+    max_concurrent_jobs: 42             # optional, defaults to '50'
 ```
 
 `bareos_jobs`: List of jobs in following format:

templates/bareos-dir/director/bareos-dir.conf.j2

@@ -1,7 +1,7 @@
 Director {                            # define myself
   Name = bareos-dir
   QueryFile = "/usr/lib/bareos/scripts/query.sql"
-  Maximum Concurrent Jobs = 50
+  Maximum Concurrent Jobs = {{ bareos_dir_max_concurrent_jobs | default('50') }}
   Password = "{{ bareos_director_password  }}"
   Messages = Daemon
   Auditing = yes

templates/bareos-dir/jobdefs/jobdef.conf.j2

@@ -55,7 +55,7 @@ Keep the legacy defaults when the template is used to define JobDefs resources
 {% if item.max_concurrent_jobs is defined %}
   Maximum Concurrent Jobs = {{ item.max_concurrent_jobs }}
 {% elif _resource_type == 'JobDefs' %}
-  Maximum Concurrent Jobs = 50
+  Maximum Concurrent Jobs = {{ item.max_concurrent_jobs | default('50') }}
 {% endif %}
 {% if item.allow_dup_jobs is defined %}
   Allow Duplicate Jobs = {{ item.allow_dup_jobs }}

templates/bareos-sd/storage/bareos-sd.conf.j2

@@ -1,6 +1,6 @@
 Storage {
   Name = {{ inventory_hostname }}-sd
-  Maximum Concurrent Jobs = 50
+  Maximum Concurrent Jobs = {{ bareos_sd_max_concurrent_jobs | default('50') }}
 
   # remove comment from "Plugin Directory" to load plugins from specified directory.
   # if "Plugin Names" is defined, only the specified plugins will be loaded,

templates/myself.conf.j2

@@ -1,7 +1,7 @@
 # {{ ansible_managed }}
 Client {
   Name = {{ item.name }}
-  Maximum Concurrent Jobs = 20
+  Maximum Concurrent Jobs = {{ item.max_concurrent_jobs | default('20') }}
 {% if item.max_job_bandwidth is defined %}
   Maximum Bandwidth Per Job = {{ item.max_job_bandwidth }}
 {% endif %}