Andrew Bogott has submitted this change and it was merged.
Change subject: backup: resource attributes quoting
......................................................................
backup: resource attributes quoting
bug: T91908
Change-Id: I0729bcceb71322b99e33b7ed4af2af9d7c10a46f
---
M modules/backup/manifests/mysqlset.pp
M modules/backup/manifests/set.pp
2 files changed, 13 insertions(+), 12 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
Dzahn: Looks good to me, but someone else must approve
diff --git a/modules/backup/manifests/mysqlset.pp
b/modules/backup/manifests/mysqlset.pp
index 8f412e8..2b8f02a 100644
--- a/modules/backup/manifests/mysqlset.pp
+++ b/modules/backup/manifests/mysqlset.pp
@@ -1,12 +1,13 @@
-define backup::mysqlset($method='bpipe',
- $xtrabackup=true,
- $per_db=false,
- $innodb_only=false,
- $local_dump_dir=undef,
- $password_file=undef,
- $mysql_binary=undef,
- $mysqldump_binary=undef,
- $jobdefaults=$role::backup::host::jobdefaults,
+define backup::mysqlset(
+ $method = 'bpipe',
+ $xtrabackup = true,
+ $per_db = false,
+ $innodb_only = false,
+ $local_dump_dir = undef,
+ $password_file = undef,
+ $mysql_binary = undef,
+ $mysqldump_binary = undef,
+ $jobdefaults = $role::backup::host::jobdefaults,
) {
$allowed_methods = [ 'bpipe', 'predump' ]
@@ -27,7 +28,7 @@
$fileset = "mysql-${basefileset}"
file { '/etc/bacula/scripts/predump':
- ensure => 'present',
+ ensure => present,
owner => 'root',
group => 'root',
mode => '0500',
@@ -44,7 +45,7 @@
mysql_binary => $mysql_binary,
mysqldump_binary => $mysqldump_binary,
}
- $extras = undef
+ $extras = undef
$fileset = "mysql-${method}-x${xtrabackup}-p${per_db}-i${innodb_only}"
}
diff --git a/modules/backup/manifests/set.pp b/modules/backup/manifests/set.pp
index 727bcc7..7a226f9 100644
--- a/modules/backup/manifests/set.pp
+++ b/modules/backup/manifests/set.pp
@@ -8,7 +8,7 @@
$motd_content = "#!/bin/sh\necho \"Backed up on this host: ${name}\""
@motd::script { "backups-${name}":
- ensure => 'present',
+ ensure => present,
priority => 06,
content => $motd_content,
tag => 'backup-motd',
--
To view, visit https://gerrit.wikimedia.org/r/195661
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0729bcceb71322b99e33b7ed4af2af9d7c10a46f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
