Fix database backups pr devel

roles/_init/defaults/main.yml

@@ -2,7 +2,7 @@
 # Common defaults. Given the "_init" role is mandatory,
 # this will ensure defaults to other roles too.
 deploy_user: "deploy"
-_mysqldump_command: "mysqldump --max-allowed-packet=128M --single-transaction --skip-opt -e --quick --skip-disable-keys --skip-add-locks -C -a --add-drop-table"
+_mysqldump_params: "--max-allowed-packet=128M --single-transaction --skip-opt -e --quick --skip-disable-keys --skip-add-locks -C -a --add-drop-table"
 drupal:
   sites:
     - folder: "default"

roles/cron/cron_database_backup/cron_database_backup-mysql/defaults/main.yml

@@ -2,4 +2,4 @@
 cron_mysql_backup:
   dumps_directory: "/home/{{ deploy_user }}/shared/{{ project_name }}_{{ build_type }}/db_backups/mysql/regular"
   keep: 10
-  mysqldump_command: "{{ _mysqldump_command }}" # set in _init but you can override here
+  mysqldump_params: "{{ _mysqldump_params }}" # set in _init but you can override here

roles/cron/cron_database_backup/cron_database_backup-mysql/templates/regular-backups.sh.j2

@@ -10,7 +10,7 @@ TARBALL="$DB_NAME-$(date -Iseconds).sql.bz2"
 KEEP=$(({{ database.original.backup.keep | default(cron_mysql_backup.keep) }}+1))
 
 backup(){
-  {{ cron_mysql_backup.mysqldump_command }} \
+  mysqldump {{ cron_mysql_backup.mysqldump_params }} \
 	    -u"$DBUSER" -p"$DBPASSWORD" -h"$DBHOST" "$CURRENT_DBNAME" | bzip2 > "$TARGET_DIR/$TARBALL"
   ln -sfn "$TARGET_DIR/$TARBALL" "$TARGET_DIR/$DB_NAME"
 }

roles/database_backup/database_backup-mysql/defaults/main.yml

@@ -2,7 +2,7 @@
 mysql_backup:
   handling: rolling
   dumps_directory: "/home/{{ deploy_user }}/shared/{{ project_name }}_{{ build_type }}/db_backups/mysql/build"
-  mysqldump_command: "{{ _mysqldump_command }}" # set in _init but you can override here
+  mysqldump_params: "{{ _mysqldump_params }}" # set in _init but you can override here
   # Number of dumps/db to keep. Note this is independant from the build codebases.
   keep: 10
   # This can be one of the following:

roles/database_backup/database_backup-mysql/tasks/deploy-dump.yml

@@ -15,6 +15,6 @@
   run_once: true
 
 - name: Take a database dump.
-  shell: "{{ mysql_backup.mysqldump_command }} --defaults-extra-file={{ database.credentials_file }} {{ database.database }} | bzip2 > {{ mysql_backup.dumps_directory }}/{{ _mysql_host }}/{{ database.database }}-{{ previous_build_number }}.sql.bz2"
+  shell: "mysqldump --defaults-extra-file={{ database.credentials_file }} {{ mysql_backup.mysqldump_params }} {{ database.database }} | bzip2 > {{ mysql_backup.dumps_directory }}/{{ _mysql_host }}/{{ database.database }}-{{ previous_build_number }}.sql.bz2"
   when: previous_build_number > 0
   run_once: true

roles/database_backup/database_backup-mysql/tasks/deploy-rolling.yml

@@ -12,6 +12,6 @@
   run_once: true
 
 - name: Populate new database.
-  shell: "{{ mysql_backup.mysqldump_command }} --defaults-extra-file={{ database.credentials_file }} {{ _mysql_previous_build_database_name }} | mysql --defaults-extra-file={{ database.credentials_file }} {{ _mysql_build_database_name }}"
+  shell: "mysqldump --defaults-extra-file={{ database.credentials_file }} {{ mysql_backup.mysqldump_params }} {{ _mysql_previous_build_database_name }} | mysql --defaults-extra-file={{ database.credentials_file }} {{ _mysql_build_database_name }}"
   when: previous_build_number > 0
   run_once: true

roles/sync/database_sync/database_sync-mysql/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 mysql_sync:
-  mysqldump_command: "{{ _mysqldump_command }}" # set in _init but you can override here
+  mysqldump_params: "{{ _mysqldump_params }}" # set in _init but you can override here
   databases:
     - source:
         # Name of the database to take a dump from.

roles/sync/database_sync/database_sync-mysql/tasks/sync.yml

@@ -67,7 +67,7 @@
   when: not database.source.type == 'rolling'
 
 - name: Take a dump from source database.
-  shell: "{{ mysql_sync.mysqldump_command }} --defaults-extra-file={{ database.source.credentials_file }} {{ mysql_sync_source_database }} | bzip2 > {{ mysql_sync_source_dump_path }}"
+  shell: "mysqldump --defaults-extra-file={{ database.source.credentials_file }} {{ mysql_sync.mysqldump_params }} {{ mysql_sync_source_database }} | bzip2 > {{ mysql_sync_source_dump_path }}"
   delegate_to: "{{ database.source.host }}"
   when:
     - not database.source.type == 'dump'