Merge pull request #1610 from synyx/backup-fix-excluded-dbs

Fix backup/rotation with multiple excluded databases

Author: bastelfreak

spec/classes/mysql_backup_mysqldump_spec.rb

@@ -76,13 +76,13 @@ class { 'mysql::server': }
         let(:params) do
           {
             'file_per_database' => true,
-            'excludedatabases' => ['information_schema']
+            'excludedatabases' => ['information_schema', 'performance_schema']
           }.merge(default_params)
         end
 
         it {
           expect(subject).to contain_file('mysqlbackup.sh').with_content(
-            %r{information_schema},
+            %r{information_schema\\\|performance_schema},
           )
         }
       end

templates/mysqlbackup.sh.epp

@@ -84,7 +84,7 @@ cleanup
 <% if $excludedatabases.empty { -%>
 mysql --defaults-extra-file=$TMPFILE -s -r -N -e 'SHOW DATABASES' | while read dbname
 <%} else {-%>
-mysql --defaults-extra-file=$TMPFILE -s -r -N -e 'SHOW DATABASES' | grep -v '^\(<%= $excludedatabases.join('|') %>\)$' | while read dbname
+mysql --defaults-extra-file=$TMPFILE -s -r -N -e 'SHOW DATABASES' | grep -v '^\(<%= $excludedatabases.join('\\|') %>\)$' | while read dbname
 <% } -%>
 do
   <%= $backupmethod %> --defaults-extra-file=$TMPFILE --opt --flush-logs --single-transaction \