Ottomata has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/278013

Change subject: Add $socket parameter to mylvmbackup
......................................................................

Add $socket parameter to mylvmbackup

Bug: T127991
Change-Id: I4c1ae2ac6f46ca03d2f463e9f00b5fe7ca78c287
---
M modules/mysql_wmf/manifests/mylvmbackup.pp
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/13/278013/1

diff --git a/modules/mysql_wmf/manifests/mylvmbackup.pp 
b/modules/mysql_wmf/manifests/mylvmbackup.pp
index 438fafa..aa8a42d 100644
--- a/modules/mysql_wmf/manifests/mylvmbackup.pp
+++ b/modules/mysql_wmf/manifests/mylvmbackup.pp
@@ -20,6 +20,9 @@
 #   See: --mountdir option for mylvmbackup.
 #   Default: /var/cache/mylvmbackup/mnt/${title}
 #
+# [*socket*]
+#   Path to mysql socket.  Default: /tmp/mysql.sock
+#
 # ...standard cron resource parameters...
 #
 # == Usage
@@ -35,6 +38,7 @@
     $vgname   = "${::hostname}-vg",
     $lvname   = 'mysql',
     $mountdir = "/var/cache/mylvmbackup/mnt/${title}",
+    $socket   = '/tmp/mysql.sock',
     $hour     = undef,
     $minute   = undef,
     $month    = undef,
@@ -90,7 +94,7 @@
     # by mylvmbackup.  Instead, this is handled by the prebackup hook,
     # which just rsyncs the lvm snapshot to a destination.
     # Use flock to make sure this only ever runs one mylvmbackup at a time.
-    $command = "/usr/bin/flock -n /var/lock/mylvmbackup-${title} -c 
'/usr/bin/mylvmbackup --hooksdir ${hooksdir} --vgname ${vgname} --lvname 
${lvname} --mountdir ${mountdir} --backuptype none 2>&1 >> 
/var/log/mylvmbackup/${title}.log'"
+    $command = "/usr/bin/flock -n /var/lock/mylvmbackup-${title} -c 
'/usr/bin/mylvmbackup --socket ${socket} --hooksdir ${hooksdir} --vgname 
${vgname} --lvname ${lvname} --mountdir ${mountdir} --backuptype none 2>&1 >> 
/var/log/mylvmbackup/${title}.log'"
     cron { "mylvmbackup-${title}":
         ensure   => $ensure,
         command  => $command,

-- 
To view, visit https://gerrit.wikimedia.org/r/278013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c1ae2ac6f46ca03d2f463e9f00b5fe7ca78c287
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to