Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/363581 )
Change subject: backup::set: Add a jobdefaults parameter
......................................................................
backup::set: Add a jobdefaults parameter
Add the $jobdefaults paramemeter, defaulting to undef, to be passed to
the bacula::client::job define as is
This fixes some issues introduced in I2d6dd6cddb116b
Change-Id: Ibd92c625c68dc8e4a16ce93586d222f82cca06c0
---
M modules/backup/manifests/set.pp
1 file changed, 9 insertions(+), 2 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/modules/backup/manifests/set.pp b/modules/backup/manifests/set.pp
index 3c0f936..f940f81 100644
--- a/modules/backup/manifests/set.pp
+++ b/modules/backup/manifests/set.pp
@@ -1,7 +1,14 @@
# backup::set is probably what you want.
-define backup::set($extras=undef) {
+define backup::set(
+ $extras=undef,
+ $jobdefaults=undef,
+) {
if defined(Class['profile::backup::host']) {
- $jobdefaults=$profile::backup::host::jobdefaults
+ if $jobdefaults {
+ $real_jobdefaults = $jobdefaults
+ } else {
+ $real_jobdefaults = $profile::backup::host::jobdefaults
+ }
@bacula::client::job { "${name}-${jobdefaults}":
fileset => $name,
jobdefaults => $jobdefaults,
--
To view, visit https://gerrit.wikimedia.org/r/363581
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd92c625c68dc8e4a16ce93586d222f82cca06c0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
