Merge "bnr - Make the galera desync retries and delay configurable" into stable/wallaby

tripleo_ansible/roles/backup_and_restore/defaults/main.yml

@@ -134,14 +134,20 @@ tripleo_backup_and_restore_overcloud_restore_name: undercloud
 # Ironic images path
 tripleo_backup_and_restore_ironic_images_path: "/var/lib/ironic/images"
 
+# Ironic ubdirectory where the kernel and initrd are uploaded
+backup_and_restore_history_path: ""
+
 # Restore retries
 tripleo_backup_and_restore_restore_retries: 300
 
 # Restore delay
 tripleo_backup_and_restore_restore_delay: 10
 
-# Ironic subdirectory where the kernel and initrd are uploaded
-backup_and_restore_history_path: ""
+# Galera retries
+tripleo_backup_and_restore_galera_retries: 300
+
+# Galera delay
+tripleo_backup_and_restore_galera_delay: 10
 
 # Ceph cluster name
 tripleo_backup_and_restore_ceph_cluster: "ceph"

tripleo_ansible/roles/backup_and_restore/tasks/db_backup.yml

@@ -104,8 +104,8 @@
     {{ tripleo_container_cli }} {{ tripleo_container_cli_flags }} exec {{ tripleo_backup_and_restore_mysql_container }} bash -c "mysql -p -u root \
     -p{{ mysql_password.stdout }} --execute 'SET GLOBAL wsrep_desync = ON'"
   register: desync_output
-  retries: 300
-  delay: 5
+  retries: "{{ tripleo_backup_and_restore_galera_retries }}"
+  delay: "{{ tripleo_backup_and_restore_galera_delay }}"
   until: desync_output.stderr == "" or '"WARN" in desync_output.stderr'
   when:
     - mysql_password.stderr is defined