Merge pull request #1083 from eputnam/markleary-master

Support for optional__args and prescript to mysqldump backup provider

Author: eputnam

manifests/server/backup.pp

@@ -53,7 +53,7 @@
 # @param maxallowedpacket
 #   Defines the maximum SQL statement size for the backup dump script. The default value is 1MB, as this is the default MySQL Server value.
 # @param optional_args
-#   Specifies an array of optional arguments which should be passed through to the backup tool. (Currently only supported by the xtrabackup provider.)
+#   Specifies an array of optional arguments which should be passed through to the backup tool. (Supported by the xtrabackup and mysqldump providers.)
 #
 class mysql::server::backup (
   $backupuser         = undef,

templates/mysqlbackup.sh.erb

@@ -28,6 +28,11 @@ echo "[client]\npassword=$PASS\nuser=$USER\nmax_allowed_packet=$MAX_ALLOWED_PACK
 echo -e "[client]\npassword=$PASS\nuser=$USER\nmax_allowed_packet=$MAX_ALLOWED_PACKET" > $TMPFILE
 <%- end -%>
 
+<% if @prescript -%>
+<%- [@prescript].flatten.compact.each do |script|%>
+<%= script %>
+<%- end -%>
+<% end -%>
 
 # Ensure backup directory exist.
 mkdir -p $DIR
@@ -54,6 +59,12 @@ ADDITIONAL_OPTIONS="$ADDITIONAL_OPTIONS --skip-routines"
 <% end -%>
 <% end -%>
 
+<%- if @optional_args and @optional_args.is_a?(Array) -%>
+<%- @optional_args.each do |arg| -%>
+ADDITIONAL_OPTIONS="$ADDITIONAL_OPTIONS <%= arg %>"
+<%- end -%>
+<%- end -%>
+
 ##### STOP CONFIG ####################################################
 PATH=<%= @execpath %>